www-servers/lighttpd: Fix #454366, own user/group

Adds support in the initd script for LIGHTTPD_USER and LIGHTTPD_GROUP,
which are gleaned from the lighttpd.conf file's relevant variables.

Thanks Eugene Rosenzweig

Gentoo-Bug: #454366
Gentoo-Bug-URL: https://bugs.gentoo.org/454366

Package-Manager: portage-2.3.0

diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
index 04dd8cc0e87288a09f3df4fa2edbf144253a4124..e345f726f9bdf9a127059860f5cb55406239eaae 100644 (file)
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,7 +31,11 @@ checkconfig() {
 
 start() {
        checkconfig || return 1
-       checkpath -d -q -m 0750 -o lighttpd:lighttpd /run/lighttpd/
+       # Glean lighttpd's credentials from the configuration file
+       # Fixes bug 454366
+       LIGHTTPD_USER="$(awk '/^server.username/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
+       LIGHTTPD_GROUP="$(awk '/^server.groupname/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
+       checkpath -d -q -m 0750 -o "${LIGHTTPD_USER}":"${LIGHTTPD_GROUP}" /run/lighttpd/
 
        ebegin "Starting lighttpd"
        start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \