diff options
Diffstat (limited to '')
-rwxr-xr-x | source/n/httpd/httpd.SlackBuild | 2 | ||||
-rw-r--r-- | source/n/httpd/rc.httpd | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index 438525eef..36a3a91e3 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=httpd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/httpd/rc.httpd b/source/n/httpd/rc.httpd index 6b251d90d..afacffb34 100644 --- a/source/n/httpd/rc.httpd +++ b/source/n/httpd/rc.httpd @@ -2,7 +2,7 @@ # # /etc/rc.d/rc.httpd # -# Start/stop/restart/graceful[ly restart]/graceful[ly]-stop +# Start/stop/force-restart/restart/graceful[ly restart]/graceful[ly]-stop # the Apache (httpd) web server. # # To make Apache start automatically at boot, make this @@ -15,17 +15,20 @@ case "$1" in /usr/sbin/apachectl -k start ;; 'stop') - /usr/sbin/apachectl -k stop - pkill -f /usr/sbin/httpd - # Remove both old and new .pid locations: - rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid + if [ ! -r /run/httpd.pid ]; then + pkill -f /usr/sbin/httpd + else + /usr/sbin/apachectl -k stop + fi + pwait -f /usr/sbin/httpd ;; 'force-restart') - # Because sometimes restarting through apachectl just doesn't do the trick... - /usr/sbin/apachectl -k stop - pkill -f /usr/sbin/httpd - # Remove both old and new .pid locations: - rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid + if [ ! -r /run/httpd.pid ]; then + pkill -f /usr/sbin/httpd + else + /usr/sbin/apachectl -k stop + fi + pwait -f /usr/sbin/httpd /usr/sbin/apachectl -k start ;; 'restart') @@ -38,7 +41,7 @@ case "$1" in /usr/sbin/apachectl -k graceful-stop ;; *) - echo "Usage: $0 {start|stop|restart|graceful|graceful-stop}" + echo "Usage: $0 {start|stop|force-restart|restart|graceful|graceful-stop}" ;; esac |