- use apache.conf by default

Changed files:
    apache.init -> 1.48
    apache.sysconfig -> 1.11

diff --git a/apache.init b/apache.init
index ffd4c90f2544ba68f6088cc566a6dd0a3bb010cd..0ca66211ac8734f1c2bb485c906e00b9921a13d9 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -32,13 +32,14 @@ else
 fi
 
 [ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
-if [ -d "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
-       CFG="-f ${HTTPD_CONF:-'/etc/httpd/httpd.conf'}"
-elif [ -n "$HTTPD_CONF" ]; then
-       echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
-       exit 1
-else
-       CFG=""
+
+if [ -n "${HTTPD_CONF}" ]; then
+       if [ -d "${HTTPD_CONF}" ] || [ -f "${HTTPD_CONF}" ]; then
+               CFG="-f ${HTTPD_CONF}"
+       else
+               echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
+               exit 1
+       fi
 fi
 
 RETVAL=0

diff --git a/apache.sysconfig b/apache.sysconfig
index 6f8f78ee430d028105ba63e0ce14232cac1d33be..949c04a8daae53b7d5af6535b8dfce1637968d43 100644 (file)
--- a/apache.sysconfig
+++ b/apache.sysconfig
@@ -5,7 +5,7 @@
 SERVICE_RUN_NICE_LEVEL="+5"
 
 # config dir/file path
-HTTPD_CONF="/etc/httpd/httpd.conf"
+HTTPD_CONF="/etc/httpd/apache.conf"
 
 # other command-line options
 HTTPD_OPTS=""