oh… we can keep webserver(*) in -common only

[packages/nginx.git] / nginx.init

diff --git a/nginx.init b/nginx.init
index 2ef3143086b5a0a82e4646f6c30360bbeae37b42..cc334abe45b919d964725ef41514323a2087ef47 100755 (executable)
--- a/nginx.init
+++ b/nginx.init
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# nginx        Nginx Web Server (@flavor@ version)
+# nginx        Nginx Web Server (@type@ version)
 #
 # chkconfig:   345 85 15
 # description:  Nginx is an HTTP(S) server, HTTP(S) reverse \
 #               proxy and IMAP/POP3 proxy server
-# processname: nginx-@flavor@
-# pidfile:     /var/run/nginx-@flavor@.pid
-# config:      /etc/nginx/nginx-@flavor@.conf
+# processname: nginx-@type@
+# pidfile:     /var/run/nginx-@type@.pid
+# config:      /etc/nginx/nginx-@type@.conf
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -15,8 +15,8 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
-nginx="/usr/sbin/nginx-@flavor@"
-svname="nginx (@flavor@)"
+nginx="/usr/sbin/nginx-@type@"
+svname="nginx (@type@)"
 prog=${nginx##*/}
 
 sysconfig="/etc/sysconfig/$prog"
@@ -38,9 +38,46 @@ else
        exit 0
 fi
 
+# configtest itself
+# must return non-zero if check failed
+# output is discarded if checkconfig is ran without details
+configtest() {
+       $nginx -t -c $NGINX_CONF_FILE
+}
+
+# wrapper for configtest
+checkconfig() {
+       local details=${1:-0}
+
+       if [ $details = 1 ]; then
+               # run config test and display report (status action)
+               show "Checking %s configuration" "$svname"; busy
+               local out
+               out=$(configtest 2>&1)
+               RETVAL=$?
+               if [ $RETVAL = 0 ]; then
+                       ok
+               else
+                       fail
+               fi
+               [ "$out" ] && echo >&2 "$out"
+       else
+               # run config test and abort with nice message if failed
+               # (for actions checking status before action).
+               configtest >/dev/null 2>&1
+               RETVAL=$?
+               if [ $RETVAL != 0 ]; then
+                       show "Checking %s configuration" "$svname"; fail
+                       nls 'Configuration test failed. See details with %s "checkconfig"' $0
+                       exit $RETVAL
+               fi
+       fi
+}
+
 start() {
        # Check if the service is already running?
        if [ ! -f $lockfile ]; then
+               checkconfig
                msg_starting "$svname"
                daemon $nginx -c $NGINX_CONF_FILE
                RETVAL=$?
@@ -54,11 +91,9 @@ stop() {
        # Stop daemons.
        if [ -f $lockfile ]; then
                msg_stopping "$svname"
-               killproc --waitforname $prog --waitfortime 60 $prog
-               # Delete pidfile only when nginx was called successfully
-               if [ $? -eq 0 ]; then
-                       rm -f $lockfile $pidfile >/dev/null 2>&1
-               fi
+               killproc -p $pidfile $prog
+               RETVAL=$?
+               rm -f $lockfile $pidfile >/dev/null 2>&1
        else
                msg_not_running "$svname"
        fi
@@ -66,8 +101,9 @@ stop() {
 
 reload() {
        if [ -f $lockfile ]; then
+               checkconfig
                msg_reloading "$svname"
-               killproc $prog -HUP
+               killproc -p $pidfile $prog -HUP
                RETVAL=$?
        else
                msg_not_running "$svname"
@@ -82,10 +118,38 @@ condrestart() {
                return
        fi
 
+       checkconfig
        stop
        start
 }
 
+# Upgrade the binary with no downtime.
+# http://nginx.org/en/docs/control.html#upgrade
+# TODO: handle revert back on failed upgrade
+upgrade() {
+       local oldbin_pidfile="${pidfile}.oldbin"
+
+       checkconfig
+       show "Upgrading $svname"
+       killproc -p $pidfile $prog -USR2
+       RETVAL=$?
+       sleep 1
+       if [ -f $oldbin_pidfile ] && [ -f $pidfile ]; then
+               show "Upgrade: stopping old process"
+               killproc -p $oldbin_pidfile $prog -QUIT
+               return 0
+       else
+               return 1
+       fi
+}
+
+# Tell nginx to reopen logs
+# http://nginx.org/en/docs/control.html#logs
+reopen_logs() {
+       show "Reopening $svname logs"
+       killproc -p $pidfile $prog -USR1
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -96,21 +160,31 @@ case "$1" in
        stop
        ;;
   restart)
+       checkconfig
        stop
        start
        ;;
   try-restart)
        condrestart 0
        ;;
-  reload|force-reload|graceful)
+  reload|graceful)
        reload
        ;;
+  force-reload|upgrade)
+       upgrade
+       ;;
+  reopen-logs)
+       reopen_logs
+       ;;
+  checkconfig|configtest)
+       checkconfig 1
+       ;;
   status)
-       status $prog
+       status --pidfile $pidfile $prog
        RETVAL=$?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|graceful|reopen-logs|checkconfig|status}"
        exit 3
        ;;
 esac