diff options
| author | abs <abs> | 2005-02-28 23:30:48 +0000 |
|---|---|---|
| committer | abs <abs> | 2005-02-28 23:30:48 +0000 |
| commit | 0cc3708d6ee4a6c31b221194f468ceebf764c72b (patch) | |
| tree | 031f7d0d5f66e19003dff84d3e7200c452c688f5 /www/apache/files | |
| parent | 5abb4891430509defa62206581aada37d302ab0a (diff) | |
| download | pkgsrc-0cc3708d6ee4a6c31b221194f468ceebf764c72b.tar.gz | |
Update apache to apache_1-3.33nb3:
Previously rc.d/apache was updated to run stop & start for restart.
'/etc/rc.d/apache restart' then picked up startssl if apache was not
running, but if apache was running it has a large chance of the
start running before the stop completes, leaving no httpd running.
Instead, add a restartssl option to apachectl, and use it.
Diffstat (limited to 'www/apache/files')
| -rw-r--r-- | www/apache/files/apache.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh index 465bb8d9760..28a3df9d5f4 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.25 2004/08/02 19:54:17 abs Exp $ +# $NetBSD: apache.sh,v 1.26 2005/02/28 23:30:49 abs Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -25,7 +25,7 @@ required_files="@PKG_SYSCONFDIR@/httpd.conf" extra_commands="reload" start_cmd="apache_doit start" stop_cmd="apache_doit stop" -restart_cmd="apache_doit stop ; apache_doit start" # For apache_start=startssl +restart_cmd="apache_doit restart" reload_cmd="apache_doit reload" apache_doit () @@ -34,6 +34,7 @@ apache_doit () case $1 in start) action=${apache_start} ;; + restart)action=re${apache_start} ;; # For apache_start=startssl reload) action=graceful ;; *) action=$1 ;; esac |