Browse Source

improve packaging by providing a reload action

Ralf S. Engelschall 9 years ago
parent
commit
d71de47d36
2 changed files with 11 additions and 2 deletions
  1. 1 1
      nginx/nginx.spec
  2. 10 1
      nginx/rc.nginx

+ 1 - 1
nginx/nginx.spec

@@ -45,7 +45,7 @@ Class:        PLUS
 Group:        Web
 License:      MIT-style
 Version:      %{V_nginx}
-Release:      20160130
+Release:      20160204
 
 #   package options
 %option       with_ajp        no

+ 10 - 1
nginx/rc.nginx

@@ -36,6 +36,10 @@
 %stop -u @l_susr@
     rcService nginx enable yes || exit 0
     rcService nginx active no  && exit 0
+    @l_prefix@/sbin/nginx -s quit
+    sleep 2
+    @l_prefix@/sbin/nginx -s stop
+    sleep 1
     nginx_signal TERM
     sleep 2
     rm -f $nginx_pidfile >/dev/null 2>&1 || true
@@ -45,12 +49,17 @@
     rcService nginx active no  && exit 0
     rc nginx stop start
 
+%reload -u @l_susr@
+    rcService nginx enable yes || exit 0
+    rcService nginx active no  && exit 0
+    @l_prefix@/sbin/nginx -s reload
+
 %daily -u @l_susr@
     rcService nginx enable yes || exit 0
     shtool rotate -f \
         -n $nginx_log_numfiles -s $nginx_log_minsize -d \
         -z $nginx_log_complevel -m 664 -o @l_nusr@ -g @l_ngrp@ \
         -P "$nginx_log_prolog" \
-        -E "$nginx_log_epilog; rc nginx restart" \
+        -E "$nginx_log_epilog; rc nginx reload" \
         $nginx_logfile