summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-04-16 16:20:00 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-04-16 16:20:00 +0000
commitfc03238d25e81e1c368c6b7b5debbb0b101df213 (patch)
tree0256db94252c9d28ab0447980b00903ef3e6e0fc /usr.sbin/httpd
parent5e6c1fc4fed92f48a837b010d37b0d154fd0bdaa (diff)
honour httpd_flags from rc.conf
ok hin@ jakob@ ho@ markus@ lebel@ avsm@ todd@
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/src/support/apachectl10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/httpd/src/support/apachectl b/usr.sbin/httpd/src/support/apachectl
index a20ae4dbce1..7ea6ed20f14 100644
--- a/usr.sbin/httpd/src/support/apachectl
+++ b/usr.sbin/httpd/src/support/apachectl
@@ -45,6 +45,12 @@ if [ "x$ARGV" = "x" ] ; then
ARGS="help"
fi
+RCFLAGS=""
+. /etc/rc.conf
+if [ "X${httpd_flags}" != X"NO" ]; then
+ RCFLAGS="${httpd_flags}"
+fi
+
for ARG in $@ $ARGS
do
# check for pidfile
@@ -68,7 +74,7 @@ do
echo "$0 $ARG: httpd (pid $PID) already running"
continue
fi
- if $HTTPD ; then
+ if $HTTPD $RCFLAGS ; then
echo "$0 $ARG: httpd started"
else
echo "$0 $ARG: httpd could not be started"
@@ -80,7 +86,7 @@ do
echo "$0 $ARG: httpd (pid $PID) already running"
continue
fi
- if $HTTPD -DSSL; then
+ if $HTTPD $RCFLAGS -DSSL; then
echo "$0 $ARG: httpd started"
else
echo "$0 $ARG: httpd could not be started"