fix initscript and default configuration

nginx-conf.patch

@@ -84,7 +84,7 @@
      server {
 -        listen       80;
 -        server_name  localhost;
-+        listen       80 default;
++        listen       80;
 +        server_name  _;
  
          #charset koi8-r;

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

nginx.spec

@@ -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 @@ fi
 
 
 %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