From 76bdc72fc4b9671d32f179db9288d96fed394332 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Tue, 19 Nov 2002 23:08:47 +0000
Subject: As per discussion in pkg/18854, remove support for apache_start.conf
 as the precedence of the contents of this file changes depending on whether
 it's started at boot time or started manually, and it's not really necessary
 to add the extra complexity since it's valid (and easier) to just set
 apache_start in /etc/rc.conf.

---
 www/apache/files/apache.sh  | 27 ++++++++-------------------
 www/apache6/files/apache.sh | 25 ++++++-------------------
 2 files changed, 14 insertions(+), 38 deletions(-)

(limited to 'www')

diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index 5742e0e9c30..45c9903a1eb 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,13 +1,16 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.23 2002/10/14 00:29:50 lukem Exp $
+# $NetBSD: apache.sh,v 1.24 2002/11/19 23:08:47 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
-# To start apache at startup, copy this script to /etc/rc.d and set
-# apache=YES in /etc/rc.conf.
+# You will need to set some variables in /etc/rc.conf to start Apache:
+#
+# apache=YES 
+# apache_start="start"  # set to "startssl" to allow HTTPS connections
+#			# if ap-ssl is installed; this variable is optional
 
 if [ -f /etc/rc.subr ]
 then
@@ -25,24 +28,10 @@ stop_cmd="apache_doit stop"
 restart_cmd="apache_doit restart"
 reload_cmd="apache_doit reload"
 
-# "${apache_start}" is the subcommand sent to apachectl to control how
-# httpd is started.  It's value may be overridden in:
-#
-#	@PKG_SYSCONFDIR@/apache_start.conf
-#	/etc/rc.conf
-#	/etc/rc.conf.d/apache,
-#
-# in order of increasing precedence.  Its possible values are "start"
-# and "startssl", and defaults to "start" unless it's already set.
-#
-: ${apache_start:=start}
-if [ -f @PKG_SYSCONFDIR@/apache_start.conf ]
-then
-	. @PKG_SYSCONFDIR@/apache_start.conf
-fi
-
 apache_doit ()
 {
+	: ${apache_start:=start}
+
 	case $1 in
 	start)	action=${apache_start} ;;
 	reload)	action=graceful ;;
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
index ba2bf9b0df7..2663e152749 100644
--- a/www/apache6/files/apache.sh
+++ b/www/apache6/files/apache.sh
@@ -1,13 +1,14 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.17 2002/10/14 00:29:51 lukem Exp $
+# $NetBSD: apache.sh,v 1.18 2002/11/19 23:08:47 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
-# To start apache at startup, copy this script to /etc/rc.d and set
-# apache=YES in /etc/rc.conf.
+# You will need to set some variables in /etc/rc.conf to start Apache:
+#
+# apache=YES 
 
 if [ -f /etc/rc.subr ]
 then
@@ -25,24 +26,10 @@ stop_cmd="apache_doit stop"
 restart_cmd="apache_doit restart"
 reload_cmd="apache_doit reload"
 
-# "${apache_start}" is the subcommand sent to apachectl to control how
-# httpd is started.  It's value may be overridden in:
-#
-#	@PKG_SYSCONFDIR@/apache_start.conf
-#	/etc/rc.conf
-#	/etc/rc.conf.d/apache,
-#
-# in order of increasing precedence.  Its possible values are "start"
-# and "startssl", and defaults to "start" unless it's already set.
-#
-: ${apache_start:=start}
-if [ -f @PKG_SYSCONFDIR@/apache_start.conf ]
-then
-	. @PKG_SYSCONFDIR@/apache_start.conf
-fi
-
 apache_doit ()
 {
+	: ${apache_start:=start}
+
 	case $1 in
 	start)	action=${apache_start} ;;
 	reload)	action=graceful ;;
-- 
cgit v1.2.3