[patch] conf.d/init.d fixes

lighttpd-start-stop.patch (text/plain), 1.14 KB, created by Markos Chandras (RETIRED) on 2011-05-12 17:31:15 UTC

Index: lighttpd.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.confd,v
retrieving revision 1.3
diff -u -B -u -r1.3 lighttpd.confd
--- lighttpd.confd	26 Aug 2007 16:25:27 -0000	1.3
+++ lighttpd.confd	12 May 2011 17:29:48 -0000
@@ -8,5 +8,5 @@
 LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf"
 
 # Location of the lighttpd pid file
-LIGHTTPD_PID="/var/run/lighttpd.pid"
+LIGHTTPD_PID="$(/usr/bin/awk '/^server.pid-file/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
 
Index: lighttpd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v
retrieving revision 1.13
diff -u -B -u -r1.13 lighttpd.initd
--- lighttpd.initd	3 Apr 2009 20:59:34 -0000	1.13
+++ lighttpd.initd	12 May 2011 17:29:48 -0000
@@ -18,6 +18,11 @@
 		return 1
 	fi
 
+	if [ -z "${LIGHTTPD_PID}" ] ; then
+		ewarn "servber.pid-file variable in ${LIHTTPD_CONF}"
+		ewarn "is not set. Falling back to lighttpd.pid"
+		LIGHTTPD_PID="lighttpd.pid"
+	fi
 	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
 }