- more complicated (rock-solid ;-) HTTPD_CONF handling

Changed files:
    apache.init -> 1.34

diff --git a/apache.init b/apache.init
index d9cb634b6d697fc711177998f72783196e6d8644..b68bc76cba6dc1e2f240bf6c5567868a711c21cf 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -33,9 +33,13 @@ 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"
+if   [ -d "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
+       CFG="-d ${HTTPD_CONF:-'/etc/httpd/httpd.conf'}"
+elif [ -f "${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=""; fi
 
 RETVAL=0