From 33523770b4652b2170cd110843b6f40825cddca8 Mon Sep 17 00:00:00 2001
From: angelos <>
Date: Sat, 30 Dec 2000 07:59:27 +0000
Subject: [PATCH] Back-out use of apachectl to start httpd:  1) It's one more
 dependency in /etc/rc  2) It's one more script that starts from /etc/rc
 (slowdown)  3) We're only going to be starting httpd in /etc/rc anyway (no
 other     weird operations), so there's no reason to force a change in
 rc.conf  4) apachectl(8) doesn't mention "startssl" directive  5) Admins can
 use apachectl to manage httpd regardless of how the    latter was started

Thanks to fgs@ for yelling about this :-)
---
 src/etc/rc      | 4 ++--
 src/etc/rc.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index 482660b5..ba7974f0 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.159 2000/12/30 06:51:09 angelos Exp $
+#	$OpenBSD: rc,v 1.160 2000/12/30 07:59:27 angelos Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -447,7 +447,7 @@ fi
 if [ "X${httpd_flags}" != X"NO"  ]; then
 	# Clean up left-over httpd locks
 	rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.*
-	echo -n ' httpd';		/usr/sbin/apachectl ${httpd_flags}
+	echo -n ' httpd';		/usr/sbin/httpd ${httpd_flags}
 fi
 
 if [ "X${ftpd_flags}" != X"NO" ]; then
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 460d384f..3a726c6b 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.54 2000/12/30 06:51:09 angelos Exp $
+#	$OpenBSD: rc.conf,v 1.55 2000/12/30 07:59:27 angelos Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -18,7 +18,7 @@ ntpdate_flags=NO	# for normal use: NTP server; run before ntpd starts
 photurisd_flags=NO	# for normal use: ""
 isakmpd_flags=NO	# for normal use: ""
 mopd_flags=NO		# for normal use: "-a"
-httpd_flags=NO		# for normal use: "start" (or "startssl" after reading ssl(8))
+httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))
 apmd_flags=NO		# for normal use: ""
 dhcpd_flags=NO		# for normal use: "-q"
 rtadvd_flags=NO		# for normal use: list of interfaces