diff options
| author | lukem <lukem> | 2002-10-14 00:29:50 +0000 |
|---|---|---|
| committer | lukem <lukem> | 2002-10-14 00:29:50 +0000 |
| commit | 084677702c78b8eba62e21c6b7447a7c514a1e10 (patch) | |
| tree | a2e114fe71731720b7caed691fd78398874afe6e /www | |
| parent | 1c0018783b9422cb70018e64ded74742a1732ae2 (diff) | |
| download | pkgsrc-084677702c78b8eba62e21c6b7447a7c514a1e10.tar.gz | |
Only set apache_start to "start" if it's not already set.
Previously, if apache_start was set in /etc/rc.conf and /etc/rc.d/apache was
loaded as part of the /etc/rc start sequence, apache_start's value would
be overridden by "apache_start=start" in this script, because /etc/rc.conf
would have already been loaded and load_rc_config() would not reload it again.
This problem would not have been seen if /etc/rc.d/apache was started
manually, or /etc/rc.conf.d/apache or @PKG_SYSCONFDIR@/apache_start.conf
was used to set apache_start.
(I am using /etc/rc.conf, and was wondering why apache wasn't starting
with ssl support at boot, but worked after a manual restart...)
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache/files/apache.sh | 6 | ||||
| -rw-r--r-- | www/apache2/files/apache.sh | 6 | ||||
| -rw-r--r-- | www/apache6/files/apache.sh | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh index 80b5954bed2..5742e0e9c30 100644 --- a/www/apache/files/apache.sh +++ b/www/apache/files/apache.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: apache.sh,v 1.22 2002/09/20 02:02:01 grant Exp $ +# $NetBSD: apache.sh,v 1.23 2002/10/14 00:29:50 lukem Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -33,9 +33,9 @@ reload_cmd="apache_doit reload" # /etc/rc.conf.d/apache, # # in order of increasing precedence. Its possible values are "start" -# and "startssl", and defaults to "start". +# and "startssl", and defaults to "start" unless it's already set. # -apache_start=start +: ${apache_start:=start} if [ -f @PKG_SYSCONFDIR@/apache_start.conf ] then . @PKG_SYSCONFDIR@/apache_start.conf diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh index bc32b4c0c17..e3249b2f71b 100644 --- a/www/apache2/files/apache.sh +++ b/www/apache2/files/apache.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: apache.sh,v 1.6 2002/09/20 02:02:01 grant Exp $ +# $NetBSD: apache.sh,v 1.7 2002/10/14 00:29:51 lukem Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -33,9 +33,9 @@ reload_cmd="apache_doit reload" # /etc/rc.conf.d/apache, # # in order of increasing precedence. Its possible values are "start" -# and "startssl", and defaults to "start". +# and "startssl", and defaults to "start" unless it's already set. # -apache_start=start +: ${apache_start:=start} if [ -f @PKG_SYSCONFDIR@/apache_start.conf ] then . @PKG_SYSCONFDIR@/apache_start.conf diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh index 9ec71f1908a..ba2bf9b0df7 100644 --- a/www/apache6/files/apache.sh +++ b/www/apache6/files/apache.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: apache.sh,v 1.16 2002/09/20 02:02:01 grant Exp $ +# $NetBSD: apache.sh,v 1.17 2002/10/14 00:29:51 lukem Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -33,9 +33,9 @@ reload_cmd="apache_doit reload" # /etc/rc.conf.d/apache, # # in order of increasing precedence. Its possible values are "start" -# and "startssl", and defaults to "start". +# and "startssl", and defaults to "start" unless it's already set. # -apache_start=start +: ${apache_start:=start} if [ -f @PKG_SYSCONFDIR@/apache_start.conf ] then . @PKG_SYSCONFDIR@/apache_start.conf |