[gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/

[Markos Chandras]

commit:     8414107dc7f3df35ab6c2fa0cddd40463fdc639a
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 16:58:59 2015 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 17:19:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8414107d

www-servers/lighttpd: Improve server.pid-file detection in openrc init script. Bug #366811

Package-Manager: portage-2.2.20.1

 www-servers/lighttpd/files/lighttpd.confd | 4 ----
 www-servers/lighttpd/files/lighttpd.initd | 9 ++++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/www-servers/lighttpd/files/lighttpd.confd b/www-servers/lighttpd/files/lighttpd.confd
index f3afb07..c7733de 100644
--- a/www-servers/lighttpd/files/lighttpd.confd
+++ b/www-servers/lighttpd/files/lighttpd.confd
@@ -6,7 +6,3 @@
 
 # Location of the lighttpd configuration file
 LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf"
-
-# Location of the lighttpd pid file
-LIGHTTPD_PID="$(/usr/bin/awk '/^server.pid-file/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
-

diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
index 23c0983..8abe3ba 100644
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -5,6 +5,8 @@
 
 extra_started_commands="reload graceful"
 
+LIGHTTPD_PID="$($(which lighttpd) -pf ${LIGHTTPD_CONF} | grep pid | cut -d '=' -f 2 | tr -d \\\" | tr -d [:space:])"
+
 depend() {
 	need net
 	use mysql logger spawn-fcgi ldap slapd netmount dns
@@ -19,9 +21,10 @@ checkconfig() {
 	fi
 
 	if [ -z "${LIGHTTPD_PID}" ] ; then
-		ewarn "server.pid-file variable in ${LIGHTTPD_CONF}"
-		ewarn "is not set. Falling back to lighttpd.pid"
-		LIGHTTPD_PID="/run/lighttpd.pid"
+		eerror "server.pid-file variable in ${LIGHTTPD_CONF}"
+		eerror "is not set. Please set this variable properly"
+		eerror "and try again"
+		return 1
 	fi
 	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
 }