rpms/nginx/devel nginx.init,1.3,1.4

[Jeremy Hinegardner (jjh)]

Author: jjh

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18824

Modified Files:
	nginx.init 
Log Message:
- add 'configtest' init command
- change config file test to -f



Index: nginx.init
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nginx.init	12 May 2008 05:51:09 -0000	1.3
+++ nginx.init	27 May 2008 04:06:16 -0000	1.4
@@ -24,13 +24,13 @@
 
 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 @@
 }
 
 restart() {
+    configtest || return $?
     stop
     start
 }
 
 reload() {
+    configtest || return $?
     echo -n $"Reloading $prog: "
     killproc $nginx -HUP
     RETVAL=$?
@@ -64,6 +66,10 @@
     restart
 }
 
+configtest() {
+  $nginx -t -c $NGINX_CONF_FILE
+}
+
 rh_status() {
     status $prog
 }
@@ -81,7 +87,7 @@
         rh_status_q || exit 0
         $1
         ;;
-    restart)
+    restart|configtest)
         $1
         ;;
     reload)
@@ -98,6 +104,6 @@
         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