[packages/nginx] merge initscripts to one
glen
glen at pld-linux.org
Sun May 3 20:35:06 CEST 2015
commit 2cb3d9b294786b7e616da6244279ffdc66ab9782
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun May 3 21:34:45 2015 +0300
merge initscripts to one
nginx-light.init | 91 ---------------------------------------
nginx-mail.init | 91 ---------------------------------------
nginx-perl.init | 91 ---------------------------------------
nginx-standard.init => nginx.init | 40 ++++++++---------
nginx.spec | 15 ++++---
5 files changed, 28 insertions(+), 300 deletions(-)
---
diff --git a/nginx.spec b/nginx.spec
index bb06b92..f1fb6eb 100644
--- 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
diff --git a/nginx-light.init b/nginx-light.init
deleted file mode 100755
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
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
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 4731b2c..9ca883e 100755
--- 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- at flavor@
+# pidfile: /var/run/nginx- at flavor@.pid
+# config: /etc/nginx/nginx- at 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- at 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- at flavor@ ]; then
+ msg_starting nginx- at flavor@
+ daemon /usr/sbin/nginx- at flavor@
RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-standard
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx- at flavor@
else
- msg_already_running nginx-standard
+ msg_already_running nginx- at 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- at flavor@ ]; then
+ msg_stopping nginx- at flavor@
+ killproc --waitforname nginx- at flavor@ --waitfortime 60 nginx- at 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- at flavor@ /var/run/nginx- at flavor@.pid >/dev/null 2>&1
fi
else
- msg_not_running nginx-standard
+ msg_not_running nginx- at flavor@
fi
}
@@ -65,7 +65,7 @@ case "$1" in
stop
;;
status)
- status nginx-standard
+ status nginx- at 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- at flavor@ ]; then
+ msg_reloading nginx- at flavor@
+ killproc nginx- at flavor@ -HUP
RETVAL=$?
else
- msg_not_running nginx-standard
+ msg_not_running nginx- at flavor@
RETVAL=7
fi
;;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/2cb3d9b294786b7e616da6244279ffdc66ab9782
More information about the pld-cvs-commit
mailing list