- conflicts before package split

[packages/apache1.git] / apache.sysconfig

diff --git a/apache.sysconfig b/apache.sysconfig
index 33d5a50edbb2112e4ca759d539c9c0c21a8042b4..0539d6d82c22e6c0efee169bcd6bce3a1cf2aff6 100644 (file)
--- a/apache.sysconfig
+++ b/apache.sysconfig
@@ -1,11 +1,11 @@
 # $Id$
-# Customized setings for apache
+# Customized settings for apache
 
 # Nice level for apache
 SERVICE_RUN_NICE_LEVEL="+5"
 
-# config dir/file path
-HTTPD_CONF="/etc/httpd/httpd.conf"
+# config dir/file path. default is compiled in path
+#HTTPD_CONF="/etc/httpd/apache.conf"
 
 # other command-line options
 HTTPD_OPTS=""
@@ -17,3 +17,6 @@ HTTPD_MPM="prefork"
 
 # perhaps set 128MB memory limit
 #SERVICE_LIMITS="$DEFAULT_SERVICE_LIMITS -m 128000"
+
+# Skip apache restarts invoked from rpm installs.
+#RPM_SKIP_AUTO_RESTART=yes