summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Bangert <bangert@gentoo.org>2006-10-07 16:28:57 +0000
committerThilo Bangert <bangert@gentoo.org>2006-10-07 16:28:57 +0000
commit3952a4bee28f9dd80a947bb42aac8a4f6a6b7a0c (patch)
treeb0817635e2f6fc2f87f6b7ab51da0673ad555254 /www-servers
parentDropped ppc-macos, as there is no modular X there. (diff)
downloadgentoo-2-3952a4bee28f9dd80a947bb42aac8a4f6a6b7a0c.tar.gz
gentoo-2-3952a4bee28f9dd80a947bb42aac8a4f6a6b7a0c.tar.bz2
gentoo-2-3952a4bee28f9dd80a947bb42aac8a4f6a6b7a0c.zip
put init script configuration variables in conf.d - fixes bug #150376 - thanks Gabi Shaar
(Portage version: 2.1.1)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/lighttpd/ChangeLog7
-rw-r--r--www-servers/lighttpd/files/lighttpd.confd6
-rw-r--r--www-servers/lighttpd/files/lighttpd.initd5
3 files changed, 13 insertions, 5 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index e78cd0522e44..72d835af3937 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/lighttpd
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.82 2006/09/29 21:18:20 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.83 2006/10/07 16:28:57 bangert Exp $
+
+ 07 Oct 2006; Thilo Bangert <bangert@gentoo.org> files/lighttpd.confd,
+ files/lighttpd.initd:
+ put init script configuration variables in conf.d
+ fixes bug #150376 - thanks Gabi Shaar
29 Sep 2006; Thilo Bangert <bangert@gentoo.org> +files/lighttpd.confd,
lighttpd-1.4.11.ebuild:
diff --git a/www-servers/lighttpd/files/lighttpd.confd b/www-servers/lighttpd/files/lighttpd.confd
index 1b9063740376..e81b63f6a317 100644
--- a/www-servers/lighttpd/files/lighttpd.confd
+++ b/www-servers/lighttpd/files/lighttpd.confd
@@ -4,3 +4,9 @@
# in the lighttpd's configuration file - fixes bug#140349
SHELL="/bin/bash"
+# Location of the lighttpd configuration file
+LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf"
+
+# Location of the lighttpd pid file
+LIGHTTPD_PID="/var/run/lighttpd.pid"
+
diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
index 201fc85f1eb4..6c9324303ae2 100644
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -1,13 +1,10 @@
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.9 2006/06/01 21:56:36 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.10 2006/10/07 16:28:57 bangert Exp $
opts="depend checkconfig start stop reload"
-LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf"
-LIGHTTPD_PID="/var/run/lighttpd.pid"
-
depend() {
need net
use mysql logger spawn-fcgi ldap slapd