diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-12-30 07:59:28 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-12-30 07:59:28 +0000 |
| commit | f6c242ed606c57d83c3caab002b7e1a99cb96c1c (patch) | |
| tree | 8284120b5998a561ced8688225039c8353416baf | |
| parent | a48929e95af6b383511d8270522a6aa47bfe52d4 (diff) | |
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 :-)
| -rw-r--r-- | etc/rc | 4 | ||||
| -rw-r--r-- | etc/rc.conf | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -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/etc/rc.conf b/etc/rc.conf index 460d384fd44..3a726c6b740 100644 --- a/etc/rc.conf +++ b/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 |