- added HTTPD_CONF variable

Changed files:
    apache.init -> 1.33
    apache.sysconfig -> 1.4

diff --git a/apache.init b/apache.init
index dcadaf92f2d0b99a0e8a7f9da20e6336ee0ae655..d9cb634b6d697fc711177998f72783196e6d8644 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -33,6 +33,10 @@ else
 fi
 
 [ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
+[ -z "$HTTPD_CONF" ] && HTTPD_CONF="/etc/httpd/httpd.conf"
+if   [ -d "$HTTPD_CONF" ]; then CFG="-d $HTTPD_CONF"
+elif [ -f "$HTTPD_CONF" ]; then CFG="-f $HTTPD_CONF"
+else CFG=""; fi
 
 RETVAL=0
 # See how we were called.
@@ -41,7 +45,7 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/httpd ]; then
                msg_starting httpd.${HTTPD_MPM}
-               daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf $HTTPD_OPTS
+               daemon httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else

diff --git a/apache.sysconfig b/apache.sysconfig
index dd164c4de065a6f342a7dda7a67ae87ed4f4c105..74ebf5f009a2742944b4d4a810670b8b40e0ca47 100644 (file)
--- a/apache.sysconfig
+++ b/apache.sysconfig
@@ -1,9 +1,13 @@
+# $Id$
 # Customized setings for apache
 
 # Nice level for apache
 SERVICE_RUN_NICE_LEVEL="+5"
 
-# Cmdline options 
+# config dir/file path
+HTTPD_CONF="/etc/httpd/httpd.conf"
+
+# other command-line options 
 HTTPD_OPTS=""
 
 # choose MPM