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

diff --git a/stage5/pkg/lighttpd b/stage5/pkg/lighttpd
index 121db2b..786de3c 100644
--- a/stage5/pkg/lighttpd
+++ b/stage5/pkg/lighttpd
@@ -2,15 +2,13 @@
 
 hvconfig_pre()
 {
-    groupadd -f ${APACHE_USER}
-    hv_useradd -c WebServer -d /dev/null -g ${APACHE_USER} -s /bin/false \
-        ${APACHE_USER}
+    groupadd --system -f ${HTTPD_USER}
+    hv_useradd --system -c WebServer -d /dev/null -g ${HTTPD_USER} \
+        -s /bin/false ${HTTPD_USER}
 }
 
 hvbuild_post()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     install -dv \
         /etc/lighttpd \
         /var/log/lighttpd \
@@ -18,8 +16,7 @@ hvbuild_post()
         /var/lib/lighttpd/sockets \
         /var/cache/lighttpd
 
-    cp -R doc/config/conf.d/ doc/config/*.conf doc/config/vhosts.d/ \
-        /etc/lighttpd/
+    cp -R ${SRC_DIR}/doc/config/{conf.d/,*.conf,vhosts.d/} /etc/lighttpd/
 
     chown -R www.www \
         /etc/lighttpd \
@@ -55,13 +52,15 @@ 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
+    cp -p ${SRC_DIR}/doc/initscripts/sysconfig.lighttpd /etc/sysconfig/lighttpd
 
     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
 }