commit fa34d6db387f1b186e7b4c453a4b374b1dd305ab
Author: Jacek Konieczny <[email protected]>
Date: Mon Oct 14 12:04:50 2013 +0200
Drop HTTPD_CONF and HTTPD_OPTS support from init/sysconfig
HTTPD_CONF support was plain wrong. Seems just copied from Apache
httpd.init and uses a command-line option which is not supported
by nginx. And adds the option to the 'killproc' command too. This
just could not work.
HTTPD_OPTS could work, but was not documented, was named wrong
and seems quite useless (nginx command-line options do not provide
any useful functionality).
nginx-light.init | 13 ++-----------
nginx-mail.init | 13 ++-----------
nginx-perl.init | 13 ++-----------
nginx-standard.init | 13 ++-----------
4 files changed, 8 insertions(+), 44 deletions(-)
---
diff --git a/nginx-light.init b/nginx-light.init
index 69f9f3f..98acafe 100755
--- a/nginx-light.init
+++ b/nginx-light.init
@@ -29,20 +29,11 @@ else
exit 0
fi
-if [ -d "${HTTPD_CONF:-'/etc/nginx/nginx-light.conf'}" ]; then
- CFG="-f ${HTTPD_CONF:-'/etc/nginx/nginx-light.conf'}"
-elif [ -n "$HTTPD_CONF" ]; then
- echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
- exit 1
-else
- CFG=""
-fi
-
start() {
# Check if the service is already running?
if [ ! -f /var/lock/subsys/nginx-light ]; then
msg_starting nginx-light
- daemon nginx-light $CFG $HTTPD_OPTS
+ daemon nginx-light
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-light
else
@@ -54,7 +45,7 @@ stop() {
# Stop daemons.
if [ -f /var/lock/subsys/nginx-light ]; then
msg_stopping nginx-light
- killproc --waitforname nginx-light --waitfortime 60 nginx-light
$CFG
+ 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
diff --git a/nginx-mail.init b/nginx-mail.init
index cf2639e..9b0b9b6 100755
--- a/nginx-mail.init
+++ b/nginx-mail.init
@@ -29,20 +29,11 @@ else
exit 0
fi
-if [ -d "${HTTPD_CONF:-'/etc/nginx/nginx-mail.conf'}" ]; then
- CFG="-f ${HTTPD_CONF:-'/etc/nginx/nginx-mail.conf'}"
-elif [ -n "$HTTPD_CONF" ]; then
- echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
- exit 1
-else
- CFG=""
-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 $CFG $HTTPD_OPTS
+ daemon /usr/sbin/nginx-mail
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-mail
else
@@ -54,7 +45,7 @@ stop() {
# Stop daemons.
if [ -f /var/lock/subsys/nginx-mail ]; then
msg_stopping nginx-mail
- killproc --waitforname nginx-mail --waitfortime 60 nginx-mail
$CFG
+ 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
diff --git a/nginx-perl.init b/nginx-perl.init
index 5d928b9..c140448 100755
--- a/nginx-perl.init
+++ b/nginx-perl.init
@@ -29,20 +29,11 @@ else
exit 0
fi
-if [ -d "${HTTPD_CONF:-'/etc/nginx/nginx-perl.conf'}" ]; then
- CFG="-f ${HTTPD_CONF:-'/etc/nginx/nginx-perl.conf'}"
-elif [ -n "$HTTPD_CONF" ]; then
- echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
- exit 1
-else
- CFG=""
-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 $CFG $HTTPD_OPTS
+ daemon /usr/sbin/nginx-perl
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-perl
else
@@ -54,7 +45,7 @@ stop() {
# Stop daemons.
if [ -f /var/lock/subsys/nginx-perl ]; then
msg_stopping nginx-perl
- killproc --waitforname nginx-perl --waitfortime 60 nginx-perl
$CFG
+ 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
diff --git a/nginx-standard.init b/nginx-standard.init
index 295cd30..4731b2c 100755
--- a/nginx-standard.init
+++ b/nginx-standard.init
@@ -29,20 +29,11 @@ else
exit 0
fi
-if [ -d "${HTTPD_CONF:-'/etc/nginx/nginx-standard.conf'}" ]; then
- CFG="-f ${HTTPD_CONF:-'/etc/nginx/nginx-standard.conf'}"
-elif [ -n "$HTTPD_CONF" ]; then
- echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
- exit 1
-else
- CFG=""
-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 $CFG $HTTPD_OPTS
+ daemon /usr/sbin/nginx-standard
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-standard
else
@@ -54,7 +45,7 @@ stop() {
# Stop daemons.
if [ -f /var/lock/subsys/nginx-standard ]; then
msg_stopping nginx-standard
- killproc --waitforname nginx-standard --waitfortime 60
nginx-standard $CFG
+ killproc --waitforname nginx-standard --waitfortime 60
nginx-standard
# 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/a20d2702caf191935e4cca185e64e5175500c01d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
