From 4fd502bee4d88a0e1e10200d9b746111c3159611 Mon Sep 17 00:00:00 2001
From: jjh <jjh@fedoraproject.org>
Date: Tue, 27 May 2008 04:06:16 +0000
Subject: [PATCH] - add 'configtest' init command - change config file test to
 -f

---
 nginx.init | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/nginx.init b/nginx.init
index 597d06e..30a4cd8 100644
--- a/nginx.init
+++ b/nginx.init
@@ -24,13 +24,13 @@ prog=$(basename $nginx)
 
 NGINX_CONF_FILE="/etc/nginx/nginx.conf"
 
-[ -e /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
+[ -f /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
 
 lockfile=/var/lock/subsys/nginx
 
 start() {
     [ -x $nginx ] || exit 5
-    [ -f $config ] || exit 6
+    [ -f $NGINX_CONF_FILE ] || exit 6
     echo -n $"Starting $prog: "
     daemon $nginx -c $NGINX_CONF_FILE
     retval=$?
@@ -49,11 +49,13 @@ stop() {
 }
 
 restart() {
+    configtest || return $?
     stop
     start
 }
 
 reload() {
+    configtest || return $?
     echo -n $"Reloading $prog: "
     killproc $nginx -HUP
     RETVAL=$?
@@ -64,6 +66,10 @@ force_reload() {
     restart
 }
 
+configtest() {
+  $nginx -t -c $NGINX_CONF_FILE
+}
+
 rh_status() {
     status $prog
 }
@@ -81,7 +87,7 @@ case "$1" in
         rh_status_q || exit 0
         $1
         ;;
-    restart)
+    restart|configtest)
         $1
         ;;
     reload)
@@ -98,6 +104,6 @@ case "$1" in
         rh_status_q || exit 0
 	    ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}"
         exit 2
 esac