X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Flighttpd;h=d5ded9fba434d7a09b278b55ddc6bf1ae65061cd;hb=49e50904d91d25b0e581997cc0d7adad11754318;hp=121db2bc81074b8ac8a0c5a0221a81fef1f82ab6;hpb=496fe638ddb82977bb02578cc9e1c39ffcc8c41e;p=hvlinux.git

diff --git a/stage5/pkg/lighttpd b/stage5/pkg/lighttpd
index 121db2b..d5ded9f 100644
--- a/stage5/pkg/lighttpd
+++ b/stage5/pkg/lighttpd
@@ -2,9 +2,9 @@
 
 hvconfig_pre()
 {
-    groupadd -f ${APACHE_USER}
-    hv_useradd -c WebServer -d /dev/null -g ${APACHE_USER} -s /bin/false \
-        ${APACHE_USER}
+    groupadd -f ${HTTPD_USER}
+    hv_useradd -c WebServer -d /dev/null -g ${HTTPD_USER} -s /bin/false \
+        ${HTTPD_USER}
 }
 
 hvbuild_post()
@@ -55,7 +55,7 @@ fastcgi.server = ( ".php" => ((
                  )))
 EOF
 
-    chown -v -R ${APACHE_USER}:${APACHE_USER} /srv/www
+    chown -v -R ${HTTPD_USER}:${HTTPD_USER} /srv/www
 
     # Bootscript
     cp -p doc/initscripts/sysconfig.lighttpd /etc/sysconfig/lighttpd
@@ -63,5 +63,7 @@ EOF
     install -v -m740 ${SCRDIR}/bootscripts/lighttpd /etc/rc.d/init.d
 
     # script-name start stop
-    bootscript_add_rc3 lighttpd 70 20
+    if [ "x${DEFAULT_WEB_SERVER}" == "xlighttpd" ]; then
+        bootscript_add_rc3 lighttpd 70 20
+    fi
 }