From 162d2ac6402032b3eb538059cfd560b5cf1b181b Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Thu, 27 Jun 2013 22:59:44 -0400
Subject: [PATCH] Replace APACHE_USER by HTTPD_USER

---
 stage5/pkg/apache       | 12 ++++++------
 stage5/pkg/lighttpd     |  8 ++++----
 stage5/pkg/squirrelmail |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/stage5/pkg/apache b/stage5/pkg/apache
index ee38f22..ab8b2f7 100644
--- a/stage5/pkg/apache
+++ b/stage5/pkg/apache
@@ -32,9 +32,9 @@ hvconfig_pre()
 </Layout>
 EOF
 
-    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}
 
     CONFIGURE_OPTS=" \
         --enable-layout=FHS \
@@ -64,8 +64,8 @@ hvbuild_post()
 
     # Modifying the configuration file to run the server as a dedicated user:
     sed -i \
-        -e "s!^\(User\).*!\1 ${APACHE_USER}!g" \
-        -e "s!^\(Group\).*!\1 ${APACHE_USER}!g" \
+        -e "s!^\(User\).*!\1 ${HTTPD_USER}!g" \
+        -e "s!^\(Group\).*!\1 ${HTTPD_USER}!g" \
         ${CONFDIR}/httpd.conf
 
     # SSL Certificates generation script
@@ -134,7 +134,7 @@ EOF
     sed -i -e "s!^ServerAdmin .*!ServerAdmin webmaster@${DOMAIN}!" ${CONFDIR}/ssl/ssl.conf
     sed -i -e "s!${CONFDIR}!${CONFDIR}/ssl!" ${CONFDIR}/ssl/ssl.conf
 
-    chown -v -R ${APACHE_USER}:${APACHE_USER} /srv/www
+    chown -v -R ${HTTPD_USER}:${HTTPD_USER} /srv/www
 
     # Bootscript
     install -v -m740 ${SCRDIR}/bootscripts/apache /etc/rc.d/init.d
diff --git a/stage5/pkg/lighttpd b/stage5/pkg/lighttpd
index 121db2b..6a0ea5a 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
diff --git a/stage5/pkg/squirrelmail b/stage5/pkg/squirrelmail
index 3047596..c9ea8e9 100644
--- a/stage5/pkg/squirrelmail
+++ b/stage5/pkg/squirrelmail
@@ -3,10 +3,10 @@
 hvbuild()
 {
     mv ${LFS_TMP}/${PACKAGE} /srv/www/htdocs/squirrelmail
-    chown -v -R ${APACHE_USER}:${APACHE_USER} /srv/www/htdocs/squirrelmail
+    chown -v -R ${HTTPD_USER}:${HTTPD_USER} /srv/www/htdocs/squirrelmail
 
     mkdir -v -p /srv/squirrelmail/{data,attach}
-    chown -v -R ${APACHE_USER}:${APACHE_USER} /srv/squirrelmail
+    chown -v -R ${HTTPD_USER}:${HTTPD_USER} /srv/squirrelmail
     chmod -v 0730 /srv/squirrelmail/attach
 
     cp /srv/www/htdocs/squirrelmail/config/config_default.php \
-- 
2.20.1