From b677e03c59a00e4820fc1a11020703d4fde388b0 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 19 Nov 2002 23:08:27 +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.

Also make the script more verbose.
---
 www/apache2/files/apache.sh | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'www')

diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
index e3249b2f71b..893c05e24fa 100644
--- a/www/apache2/files/apache.sh
+++ b/www/apache2/files/apache.sh
@@ -1,13 +1,16 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.7 2002/10/14 00:29:51 lukem Exp $
+# $NetBSD: apache.sh,v 1.8 2002/11/19 23:08:27 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;
+#			# this variable is optional
 
 if [ -f /etc/rc.subr ]
 then
@@ -25,29 +28,26 @@ 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 ;;
 	*)	action=$1 ;;
 	esac
+
+	if [ ! -x ${ctl_command} ]; then
+		return
+	fi
+
+	case ${action} in
+	start|startssl)	@ECHO@ "Starting ${name}." ;;
+	stop)		@ECHO@ "Stopping ${name}." ;;
+	restart)	@ECHO@ "Restarting ${name}." ;;
+	esac
+
 	${ctl_command} ${action}
 }
 
-- 
cgit v1.2.3