From 77079cb1396866ebc236ee46727c72c682bdf4ac Mon Sep 17 00:00:00 2001
From: radek <radek@pld-linux.org>
Date: Fri, 15 Oct 2004 20:29:45 +0000
Subject: [PATCH] - added HTTPD_CONF variable

Changed files:
    apache.init -> 1.33
    apache.sysconfig -> 1.4
---
 apache.init      | 6 +++++-
 apache.sysconfig | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apache.init b/apache.init
index dcadaf9..d9cb634 100644
--- 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 dd164c4..74ebf5f 100644
--- 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
-- 
2.44.0