rpms/nginx/F-8 nginx-conf.patch, 1.2, 1.3 nginx.init, 1.3, 1.4 nginx.spec, 1.18, 1.19

[Jeremy Hinegardner (jjh)]

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20098/F-8

Modified Files:
	nginx-conf.patch nginx.init nginx.spec 
Log Message:
fix initscript and default configuration

nginx-conf.patch:

Index: nginx-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-8/nginx-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nginx-conf.patch	12 May 2008 05:24:06 -0000	1.2
+++ nginx-conf.patch	27 May 2008 04:43:12 -0000	1.3
@@ -84,7 +84,7 @@
      server {
 -        listen       80;
 -        server_name  localhost;
-+        listen       80 default;
++        listen       80;
 +        server_name  _;
  
          #charset koi8-r;


Index: nginx.init
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-8/nginx.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nginx.init	12 May 2008 05:35:59 -0000	1.3
+++ nginx.init	27 May 2008 04:43:12 -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


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-8/nginx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nginx.spec	13 May 2008 04:05:57 -0000	1.18
+++ nginx.spec	27 May 2008 04:43:12 -0000	1.19
@@ -9,7 +9,7 @@
 
 Name:           nginx
 Version:        0.6.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -190,6 +190,10 @@
 
 
 %changelog
+* Mon May 26 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-2
+- init script fixes
+- resolve 'listen 80 default' [#447873]
+
 * Mon May 12 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-1
 - update to 0.6.31