SOURCES: apache.sysconfig, apache.init - use apache.conf by default

[glen]

Author: glen                         Date: Wed Dec 14 21:20:30 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use apache.conf by default

---- Files affected:
SOURCES:
   apache.sysconfig (1.10 -> 1.11) , apache.init (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: SOURCES/apache.sysconfig
diff -u SOURCES/apache.sysconfig:1.10 SOURCES/apache.sysconfig:1.11
--- SOURCES/apache.sysconfig:1.10	Tue Jul 12 22:36:03 2005
+++ SOURCES/apache.sysconfig	Wed Dec 14 22:20:24 2005
@@ -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=""

================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.47 SOURCES/apache.init:1.48
--- SOURCES/apache.init:1.47	Thu Dec  8 01:41:26 2005
+++ SOURCES/apache.init	Wed Dec 14 22:20:25 2005
@@ -32,13 +32,14 @@
 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache.sysconfig?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SOURCES/apache.init?r1=1.47&r2=1.48&f=u