merge initscripts to one

diff --git a/nginx-light.init b/nginx-light.init
deleted file mode 100755 (executable)
index 98acafe..0000000
--- a/nginx-light.init
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-#
-# nginx        Nginx Web Server (light version)
-#
-# chkconfig:   345 85 15
-# description: Nginx is a World Wide Web server.  It is used to serve \
-#              HTML files and CGI.
-# processname: nginx-light
-# pidfile:     /var/run/nginx-light.pid
-# config:      /etc/nginx/nginx-light.conf
-
-
-# Source function library
-. /etc/rc.d/init.d/functions
-
-# Get network config
-. /etc/sysconfig/network
-
-# Get service config
-[ -f /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down nginx-light
-               exit 1
-       fi
-else
-       exit 0
-fi
-
-start() {
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/nginx-light ]; then
-               msg_starting nginx-light
-               daemon nginx-light
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-light
-       else
-               msg_already_running nginx-light
-       fi
-}
-
-stop() {
-       # Stop daemons.
-       if [ -f /var/lock/subsys/nginx-light ]; then
-               msg_stopping nginx-light
-               killproc --waitforname nginx-light --waitfortime 60 nginx-light
-               # Delete pidfile only when nginx was called successfully
-               if [ $? -eq 0 ]; then
-                       rm -f /var/lock/subsys/nginx-light /var/run/nginx-light.pid >/dev/null 2>&1
-               fi
-       else
-               msg_not_running nginx-light
-       fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-       start
-       ;;
-  stop)
-       stop
-       ;;
-  status)
-       status nginx-light
-       RETVAL=$?
-       ;;
-  restart)
-       stop
-       start
-       ;;
-  reload|force-reload|graceful)
-       if [ -f /var/lock/subsys/nginx-light ]; then
-               msg_reloading nginx-light
-               killproc nginx-light -HUP
-               RETVAL=$?
-       else
-               msg_not_running nginx-light
-               RETVAL=7
-       fi
-       ;;
-  *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
-       exit 3
-       ;;
-esac
-
-exit $RETVAL

diff --git a/nginx-mail.init b/nginx-mail.init
deleted file mode 100755 (executable)
index 9b0b9b6..0000000
--- a/nginx-mail.init
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-#
-# nginx        Nginx Web Server (mail version)
-#
-# chkconfig:   345 85 15
-# description: Nginx is a World Wide Web server.  It is used to serve \
-#              HTML files and CGI.
-# processname: nginx-mail
-# pidfile:     /var/run/nginx-mail.pid
-# config:      /etc/nginx/nginx-mail.conf
-
-
-# Source function library
-. /etc/rc.d/init.d/functions
-
-# Get network config
-. /etc/sysconfig/network
-
-# Get service config
-[ -f /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down nginx-mail
-               exit 1
-       fi
-else
-       exit 0
-fi
-
-start() {
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/nginx-mail ]; then
-               msg_starting nginx-mail
-               daemon /usr/sbin/nginx-mail
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-mail
-       else
-               msg_already_running nginx-mail
-       fi
-}
-
-stop() {
-       # Stop daemons.
-       if [ -f /var/lock/subsys/nginx-mail ]; then
-               msg_stopping nginx-mail
-               killproc --waitforname nginx-mail --waitfortime 60 nginx-mail
-               # Delete pidfile only when nginx was called successfully
-               if [ $? -eq 0 ]; then
-                       rm -f /var/lock/subsys/nginx-mail /var/run/nginx-mail.pid >/dev/null 2>&1
-               fi
-       else
-               msg_not_running nginx-mail
-       fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-       start
-       ;;
-  stop)
-       stop
-       ;;
-  status)
-       status nginx-mail
-       RETVAL=$?
-       ;;
-  restart)
-       stop
-       start
-       ;;
-  reload|force-reload|graceful)
-       if [ -f /var/lock/subsys/nginx-mail ]; then
-               msg_reloading nginx-mail
-               killproc nginx-mail -HUP
-               RETVAL=$?
-       else
-               msg_not_running nginx-mail
-               RETVAL=7
-       fi
-       ;;
-  *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
-       exit 3
-       ;;
-esac
-
-exit $RETVAL

diff --git a/nginx-perl.init b/nginx-perl.init
deleted file mode 100755 (executable)
index c140448..0000000
--- a/nginx-perl.init
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-#
-# nginx        Nginx Web Server (perl version)
-#
-# chkconfig:   345 85 15
-# description: Nginx is a World Wide Web server.  It is used to serve \
-#              HTML files and CGI.
-# processname: nginx-perl
-# pidfile:     /var/run/nginx-perl.pid
-# config:      /etc/nginx/nginx-perl.conf
-
-
-# Source function library
-. /etc/rc.d/init.d/functions
-
-# Get network config
-. /etc/sysconfig/network
-
-# Get service config
-[ -f /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down nginx-perl
-               exit 1
-       fi
-else
-       exit 0
-fi
-
-start() {
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/nginx-perl ]; then
-               msg_starting nginx-perl
-               daemon /usr/sbin/nginx-perl
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-perl
-       else
-               msg_already_running nginx-perl
-       fi
-}
-
-stop() {
-       # Stop daemons.
-       if [ -f /var/lock/subsys/nginx-perl ]; then
-               msg_stopping nginx-perl
-               killproc --waitforname nginx-perl --waitfortime 60 nginx-perl
-               # Delete pidfile only when nginx was called successfully
-               if [ $? -eq 0 ]; then
-                       rm -f /var/lock/subsys/nginx-perl /var/run/nginx-perl.pid >/dev/null 2>&1
-               fi
-       else
-               msg_not_running nginx-perl
-       fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-       start
-       ;;
-  stop)
-       stop
-       ;;
-  status)
-       status nginx-perl
-       RETVAL=$?
-       ;;
-  restart)
-       stop
-       start
-       ;;
-  reload|force-reload|graceful)
-       if [ -f /var/lock/subsys/nginx-perl ]; then
-               msg_reloading nginx-perl
-               killproc nginx-perl -HUP
-               RETVAL=$?
-       else
-               msg_not_running nginx-perl
-               RETVAL=7
-       fi
-       ;;
-  *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
-       exit 3
-       ;;
-esac
-
-exit $RETVAL

diff --git a/nginx-standard.init b/nginx.init
similarity index 55%
rename from nginx-standard.init
rename to nginx.init
index 4731b2c589dbdee45c7d4454bff74cb1e5ef2f45..9ca883ec3b563d1b1fd024ff569994300e15715e 100755 (executable)
--- a/nginx-standard.init
+++ b/nginx.init
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# nginx        Nginx Web Server (standard version)
+# nginx        Nginx Web Server (@flavor@ version)
 #
 # chkconfig:   345 85 15
 # description: Nginx is a World Wide Web server.  It is used to serve \
 #              HTML files and CGI.
-# processname: nginx-standard
-# pidfile:     /var/run/nginx-standard.pid
-# config:      /etc/nginx/nginx-standard.conf
+# processname: nginx-@flavor@
+# pidfile:     /var/run/nginx-@flavor@.pid
+# config:      /etc/nginx/nginx-@flavor@.conf
 
 
 # Source function library
@@ -22,7 +22,7 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down nginx-standard
+               msg_network_down nginx-@flavor@
                exit 1
        fi
 else
@@ -31,27 +31,27 @@ fi
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/nginx-standard ]; then
-               msg_starting nginx-standard
-               daemon /usr/sbin/nginx-standard
+       if [ ! -f /var/lock/subsys/nginx-@flavor@ ]; then
+               msg_starting nginx-@flavor@
+               daemon /usr/sbin/nginx-@flavor@
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-standard
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-@flavor@
        else
-               msg_already_running nginx-standard
+               msg_already_running nginx-@flavor@
        fi
 }
 
 stop() {
        # Stop daemons.
-       if [ -f /var/lock/subsys/nginx-standard ]; then
-               msg_stopping nginx-standard
-               killproc --waitforname nginx-standard --waitfortime 60 nginx-standard
+       if [ -f /var/lock/subsys/nginx-@flavor@ ]; then
+               msg_stopping nginx-@flavor@
+               killproc --waitforname nginx-@flavor@ --waitfortime 60 nginx-@flavor@
                # Delete pidfile only when nginx was called successfully
                if [ $? -eq 0 ]; then
-                       rm -f /var/lock/subsys/nginx-standard /var/run/nginx-standard.pid >/dev/null 2>&1
+                       rm -f /var/lock/subsys/nginx-@flavor@ /var/run/nginx-@flavor@.pid >/dev/null 2>&1
                fi
        else
-               msg_not_running nginx-standard
+               msg_not_running nginx-@flavor@
        fi
 }
 
@@ -65,7 +65,7 @@ case "$1" in
        stop
        ;;
   status)
-       status nginx-standard
+       status nginx-@flavor@
        RETVAL=$?
        ;;
   restart)
@@ -73,12 +73,12 @@ case "$1" in
        start
        ;;
   reload|force-reload|graceful)
-       if [ -f /var/lock/subsys/nginx-standard ]; then
-               msg_reloading nginx-standard
-               killproc nginx-standard -HUP
+       if [ -f /var/lock/subsys/nginx-@flavor@ ]; then
+               msg_reloading nginx-@flavor@
+               killproc nginx-@flavor@ -HUP
                RETVAL=$?
        else
-               msg_not_running nginx-standard
+               msg_not_running nginx-@flavor@
                RETVAL=7
        fi
        ;;

diff --git a/nginx.spec b/nginx.spec
index bb06b925edf39e1ab549b379c2a82a1e2f206334..f1fb6eb83f35c47833e9889598329dbe0c2555a1 100644 (file)
--- a/nginx.spec
+++ b/nginx.spec
@@ -48,16 +48,13 @@ Source3:    %{name}.logrotate
 Source4:       %{name}.mime
 Source5:       %{name}-light.conf
 Source6:       %{name}-light.monitrc
-Source7:       %{name}-light.init
+Source7:       %{name}.init
 Source8:       %{name}-mail.conf
 Source9:       %{name}-mail.monitrc
-Source10:      %{name}-mail.init
 Source11:      %{name}-perl.conf
 Source12:      %{name}-perl.monitrc
-Source13:      %{name}-perl.init
 Source14:      %{name}-standard.conf
 Source15:      %{name}-standard.monitrc
-Source16:      %{name}-standard.init
 Source17:      %{name}-mime.types.sh
 Source18:      %{name}-standard.service
 Source19:      %{name}-light.service
@@ -467,7 +464,8 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-standard.conf
 cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/monit/%{name}-standard.monitrc
-install -p %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-standard
+install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-standard
+%{__sed} -i -e 's/@flavor@/standard/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-standard
 cp -p %{SOURCE18} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-standard.service
 install -p bin/nginx-standard $RPM_BUILD_ROOT%{_sbindir}
 ln -sf %{systemdunitdir}/%{name}-standard.service $RPM_BUILD_ROOT/etc/systemd/system/nginx.service
@@ -476,6 +474,7 @@ ln -sf %{systemdunitdir}/%{name}-standard.service $RPM_BUILD_ROOT/etc/systemd/sy
 cp -p  %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-light.conf
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/monit/%{name}-light.monitrc
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-light
+%{__sed} -i -e 's/@flavor@/light/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-light
 cp -p %{SOURCE19} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-light.service
 install -p bin/nginx-light $RPM_BUILD_ROOT%{_sbindir}
 %endif
@@ -484,7 +483,8 @@ install -p bin/nginx-light $RPM_BUILD_ROOT%{_sbindir}
 cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-mail.conf
 cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/monit/%{name}-mail.monitrc
 install -p bin/nginx-mail $RPM_BUILD_ROOT%{_sbindir}
-install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-mail
+install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-mail
+%{__sed} -i -e 's/@flavor@/mail/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-mail
 cp -p %{SOURCE21} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-mail.service
 %endif
 
@@ -492,7 +492,8 @@ cp -p %{SOURCE21} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-mail.service
 install -d $RPM_BUILD_ROOT{%{perl_vendorarch},%{perl_vendorarch}/auto/%{name}}
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-perl.conf
 cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}-perl.monitrc
-install -p %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-perl
+install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-perl
+%{__sed} -i -e 's/@flavor@/perl/g' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-perl
 cp -p %{SOURCE20} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-perl.service
 cp -p bin/nginx.pm $RPM_BUILD_ROOT%{perl_vendorarch}/%{name}.pm
 install -p bin/nginx.so $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so