dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 04:25:49 +00:00 · 2009-11-26 01:23:29 +00:00 · 2009-04-11 23:29:26 +00:00 · 2009-02-19 08:49:03 +00:00 · 2009-02-19 08:44:55 +00:00 · 2009-02-19 08:37:21 +00:00
19 changed files with 650 additions and 144 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-nginx-0.5.35.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+nginx-0.6.36.tar.gz
--- a/404.html
+++ b/404.html
@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <head>
+        <title>The page is not found</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <style type="text/css">
+            /*<![CDATA[*/
+            body {
+                background-color: #fff;
+                color: #000;
+                font-size: 0.9em;
+                font-family: sans-serif,helvetica;
+                margin: 0;
+                padding: 0;
+            }
+            :link {
+                color: #c00;
+            }
+            :visited {
+                color: #c00;
+            }
+            a:hover {
+                color: #f50;
+            }
+            h1 {
+                text-align: center;
+                margin: 0;
+                padding: 0.6em 2em 0.4em;
+                background-color: #294172;
+                color: #fff;
+                font-weight: normal;
+                font-size: 1.75em;
+                border-bottom: 2px solid #000;
+            }
+            h1 strong {
+                font-weight: bold;
+                font-size: 1.5em;
+            }
+            h2 {
+                text-align: center;
+                background-color: #3C6EB4;
+                font-size: 1.1em;
+                font-weight: bold;
+                color: #fff;
+                margin: 0;
+                padding: 0.5em;
+                border-bottom: 2px solid #294172;
+            }
+            h3 {
+                text-align: center;
+                background-color: #ff0000;
+                padding: 0.5em;
+                color: #fff;
+            }
+            hr {
+                display: none;
+            }
+            .content {
+                padding: 1em 5em;
+            }
+            .alert {
+                border: 2px solid #000;
+            }
+
+            img {
+                border: 2px solid #fff;
+                padding: 2px;
+                margin: 2px;
+            }
+            a:hover img {
+                border: 2px solid #294172;
+            }
+            .logos {
+                margin: 1em;
+                text-align: center;
+            }
+            /*]]>*/
+        </style>
+    </head>
+
+    <body>
+        <h1><strong>nginx error!</strong></h1>
+
+        <div class="content">
+
+            <h3>The page you are looking for is not found.</h3>
+
+            <div class="alert">
+                <h2>Website Administrator</h2>
+                <div class="content">
+                    <p>Something has triggered missing webpage on your
+                    website. This is the default 404 error page for
+                    <strong>nginx</strong> that is distributed with
+                    Fedora.  It is located
+                    <tt>/usr/share/nginx/html/404.html</tt></p>
+
+                    <p>You should customize this error page for your own
+                    site or edit the <tt>error_page</tt> directive in
+                    the <strong>nginx</strong> configuration file
+                    <tt>/etc/nginx/nginx.conf</tt>.</p>
+
+                </div>
+            </div>
+
+            <div class="logos">
+                <a href="http://nginx.net/"><img
+                    src="nginx-logo.png" 
+                    alt="[ Powered by nginx ]"
+                    width="121" height="32" /></a>
+
+                <a href="http://fedoraproject.org/"><img 
+                    src="poweredby.png" 
+                    alt="[ Powered by Fedora ]" 
+                    width="88" height="31" /></a>
+            </div>
+        </div>
+    </body>
+</html>
--- a/50x.html
+++ b/50x.html
@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <head>
+        <title>The page is temporarily unavailable</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <style type="text/css">
+            /*<![CDATA[*/
+            body {
+                background-color: #fff;
+                color: #000;
+                font-size: 0.9em;
+                font-family: sans-serif,helvetica;
+                margin: 0;
+                padding: 0;
+            }
+            :link {
+                color: #c00;
+            }
+            :visited {
+                color: #c00;
+            }
+            a:hover {
+                color: #f50;
+            }
+            h1 {
+                text-align: center;
+                margin: 0;
+                padding: 0.6em 2em 0.4em;
+                background-color: #294172;
+                color: #fff;
+                font-weight: normal;
+                font-size: 1.75em;
+                border-bottom: 2px solid #000;
+            }
+            h1 strong {
+                font-weight: bold;
+                font-size: 1.5em;
+            }
+            h2 {
+                text-align: center;
+                background-color: #3C6EB4;
+                font-size: 1.1em;
+                font-weight: bold;
+                color: #fff;
+                margin: 0;
+                padding: 0.5em;
+                border-bottom: 2px solid #294172;
+            }
+            h3 {
+                text-align: center;
+                background-color: #ff0000;
+                padding: 0.5em;
+                color: #fff;
+            }
+            hr {
+                display: none;
+            }
+            .content {
+                padding: 1em 5em;
+            }
+            .alert {
+                border: 2px solid #000;
+            }
+
+            img {
+                border: 2px solid #fff;
+                padding: 2px;
+                margin: 2px;
+            }
+            a:hover img {
+                border: 2px solid #294172;
+            }
+            .logos {
+                margin: 1em;
+                text-align: center;
+            }
+            /*]]>*/
+        </style>
+    </head>
+
+    <body>
+        <h1><strong>nginx error!</strong></h1>
+
+        <div class="content">
+
+            <h3>The page you are looking for is temporarily unavailable.  Please try again later.</h3>
+
+            <div class="alert">
+                <h2>Website Administrator</h2>
+                <div class="content">
+                    <p>Something has triggered an error on your
+                    website.  This is the default error page for
+                    <strong>nginx</strong> that is distributed with
+                    Fedora.  It is located
+                    <tt>/usr/share/nginx/html/50x.html</tt></p>
+
+                    <p>You should customize this error page for your own
+                    site or edit the <tt>error_page</tt> directive in
+                    the <strong>nginx</strong> configuration file
+                    <tt>/etc/nginx/nginx.conf</tt>.</p>
+
+                </div>
+            </div>
+
+            <div class="logos">
+                <a href="http://nginx.net/"><img
+                    src="nginx-logo.png" 
+                    alt="[ Powered by nginx ]"
+                    width="121" height="32" /></a>
+
+                <a href="http://fedoraproject.org/"><img 
+                    src="poweredby.png" 
+                    alt="[ Powered by Fedora ]" 
+                    width="88" height="31" /></a>
+            </div>
+        </div>
+    </body>
+</html>
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: nginx
-# $Id$
-NAME := nginx
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/index.html
+++ b/index.html
@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <head>
+        <title>Test Page for the Nginx HTTP Server on Fedora</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <style type="text/css">
+            /*<![CDATA[*/
+            body {
+                background-color: #fff;
+                color: #000;
+                font-size: 0.9em;
+                font-family: sans-serif,helvetica;
+                margin: 0;
+                padding: 0;
+            }
+            :link {
+                color: #c00;
+            }
+            :visited {
+                color: #c00;
+            }
+            a:hover {
+                color: #f50;
+            }
+            h1 {
+                text-align: center;
+                margin: 0;
+                padding: 0.6em 2em 0.4em;
+                background-color: #294172;
+                color: #fff;
+                font-weight: normal;
+                font-size: 1.75em;
+                border-bottom: 2px solid #000;
+            }
+            h1 strong {
+                font-weight: bold;
+                font-size: 1.5em;
+            }
+            h2 {
+                text-align: center;
+                background-color: #3C6EB4;
+                font-size: 1.1em;
+                font-weight: bold;
+                color: #fff;
+                margin: 0;
+                padding: 0.5em;
+                border-bottom: 2px solid #294172;
+            }
+            hr {
+                display: none;
+            }
+            .content {
+                padding: 1em 5em;
+            }
+            .alert {
+                border: 2px solid #000;
+            }
+
+            img {
+                border: 2px solid #fff;
+                padding: 2px;
+                margin: 2px;
+            }
+            a:hover img {
+                border: 2px solid #294172;
+            }
+            .logos {
+                margin: 1em;
+                text-align: center;
+            }
+            /*]]>*/
+        </style>
+    </head>
+
+    <body>
+        <h1>Welcome to <strong>nginx</strong> on Fedora!</h1>
+
+        <div class="content">
+            <p>This page is used to test the proper operation of the
+            <strong>nginx</strong> HTTP server after it has been
+            installed. If you can read this page, it means that the
+            web server installed at this site is working
+            properly.</p>
+
+            <div class="alert">
+                <h2>Website Administrator</h2>
+                <div class="content">
+                    <p>This is the default <tt>index.html</tt> page that
+                    is distributed with <strong>nginx</strong> on
+                    Fedora.  It is located in
+                    <tt>/usr/share/nginx/html</tt>.</p>
+
+                    <p>You should now put your content in a location of
+                    your choice and edit the <tt>root</tt> configuration
+                    directive in the <strong>nginx</strong>
+                    configuration file
+                    <tt>/etc/nginx/nginx.conf</tt>.</p>
+
+                </div>
+            </div>
+
+            <div class="logos">
+                <a href="http://nginx.net/"><img
+                    src="nginx-logo.png" 
+                    alt="[ Powered by nginx ]"
+                    width="121" height="32" /></a>
+
+                <a href="http://fedoraproject.org/"><img 
+                    src="poweredby.png" 
+                    alt="[ Powered by Fedora ]" 
+                    width="88" height="31" /></a>
+            </div>
+        </div>
+    </body>
+</html>
--- a/nginx-auto-install.patch
+++ b/nginx-auto-install.patch
@ -1,68 +0,0 @@
--- auto/install.orig	2007-03-22 09:30:15.000000000 -0600
-+++ auto/install	2007-03-22 09:40:42.000000000 -0600
-@@ -19,42 +19,42 @@
- 
- install:	$NGX_OBJS${ngx_dirsep}nginx${ngx_binext}	\
- 		$NGX_INSTALL_PERL_MODULES
-	test -d '$NGX_PREFIX' || mkdir -p '$NGX_PREFIX'
-+	test -d '$NGX_DEST_DIR$NGX_PREFIX' || mkdir -p '$NGX_DEST_DIR$NGX_PREFIX'
- 
-	test -d '`dirname "$NGX_SBIN_PATH"`' \
-		|| mkdir -p '`dirname "$NGX_SBIN_PATH"`'
-	test ! -f '$NGX_SBIN_PATH' || mv '$NGX_SBIN_PATH' '$NGX_SBIN_PATH.old'
-	cp $NGX_OBJS/nginx '$NGX_SBIN_PATH'
-+	test -d '`dirname "$NGX_DEST_DIR$NGX_SBIN_PATH"`' \
-+		|| mkdir -p '`dirname "$NGX_DEST_DIR$NGX_SBIN_PATH"`'
-+	test ! -f '$NGX_DEST_DIR$NGX_SBIN_PATH' || mv '$NGX_DEST_DIR$NGX_SBIN_PATH' '$NGX_DEST_DIR$NGX_SBIN_PATH.old'
-+	cp $NGX_OBJS/nginx '$NGX_DEST_DIR$NGX_SBIN_PATH'
- 
-	test -d '`dirname "$NGX_CONF_PATH"`' \
-		|| mkdir -p '`dirname "$NGX_CONF_PATH"`'
-+	test -d '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`' \
-+		|| mkdir -p '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`'
- 
-	cp conf/koi-win '`dirname "$NGX_CONF_PATH"`'
-	cp conf/koi-utf '`dirname "$NGX_CONF_PATH"`'
-	cp conf/win-utf '`dirname "$NGX_CONF_PATH"`'
-+	cp conf/koi-win '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`'
-+	cp conf/koi-utf '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`'
-+	cp conf/win-utf '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`'
- 
-	test -f '`dirname "$NGX_CONF_PATH"`/mime.types' || \
-		cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types'
-	cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types.default'
-+	test -f '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`/mime.types' || \
-+		cp conf/mime.types '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`/mime.types'
-+	cp conf/mime.types '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`/mime.types.default'
- 
-	test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PATH'
-	cp conf/nginx.conf '`dirname "$NGX_CONF_PATH"`/nginx.conf.default'
-+	test -f '$NGX_DEST_DIR$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_DEST_DIR$NGX_CONF_PATH'
-+	cp conf/nginx.conf '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`/nginx.conf.default'
- 
-	test -d '`dirname "$NGX_PID_PATH"`' \
-		|| mkdir -p '`dirname "$NGX_PID_PATH"`'
-+	test -d '`dirname "$NGX_DEST_DIR$NGX_PID_PATH"`' \
-+		|| mkdir -p '`dirname "$NGX_DEST_DIR$NGX_PID_PATH"`'
- 
-	test -d '`dirname "$NGX_HTTP_LOG_PATH"`' || \
-		mkdir -p '`dirname "$NGX_HTTP_LOG_PATH"`'
-+	test -d '`dirname "$NGX_DEST_DIR$NGX_HTTP_LOG_PATH"`' || \
-+		mkdir -p '`dirname "$NGX_DEST_DIR$NGX_HTTP_LOG_PATH"`'
- 
-	test -d '$NGX_PREFIX/html' || cp -r html '$NGX_PREFIX'
-+	test -d '$NGX_DEST_DIR$NGX_PREFIX/html' || cp -r html '$NGX_DEST_DIR$NGX_PREFIX'
- END
- 
- 
-if test -n "$NGX_ERROR_LOG_PATH"; then
-+if test -n "$NGX_DEST_DIR/$NGX_ERROR_LOG_PATH"; then
-     cat << END                                                >> $NGX_MAKEFILE
- 
-	test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \
-		mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`'
-+	test -d '`dirname "$NGX_DEST_DIR/$NGX_ERROR_LOG_PATH"`' || \
-+		mkdir -p '`dirname "$NGX_DEST_DIR/$NGX_ERROR_LOG_PATH"`'
- END
- 
- fi
--- a/nginx-auto-options.patch
+++ b/nginx-auto-options.patch
@ -1,10 +0,0 @@
--- auto/options.orig	2007-03-22 09:34:58.000000000 -0600
-+++ auto/options	2007-03-22 09:35:33.000000000 -0600
-@@ -4,6 +4,7 @@
- 
- help=no
- 
-+NGX_DEST_DIR=${DESTDIR:-}
- NGX_PREFIX=
- NGX_SBIN_PATH=
- NGX_CONF_PATH=
--- a/nginx-conf.patch
+++ b/nginx-conf.patch
@ -1,28 +1,60 @@
--- conf/nginx.conf.orig	2007-03-22 22:44:23.000000000 -0600
-+++ conf/nginx.conf	2007-03-22 23:06:48.000000000 -0600
-@@ -1,12 +1,11 @@
-
+--- conf/nginx.conf.orig	2008-05-11 21:19:44.000000000 -0600
+++ conf/nginx.conf	2008-05-11 22:20:32.000000000 -0600
+@@ -1,28 +1,59 @@
+#######################################################################
+#
+# This is the main Nginx configuration file.  
+#
+# More information about the configuration options is available on 
+#   * the English wiki - http://wiki.codemongers.com/Main
+#   * the Russian documentation - http://sysoev.ru/nginx/
+#
+#######################################################################
+
+#----------------------------------------------------------------------
+# Main Module - directives that cover basic functionality
+#
+#   http://wiki.codemongers.com/NginxMainModule
+#
+#----------------------------------------------------------------------
+ 
 -#user  nobody;
-+user  nginx;
+user              nginx;
 worker_processes  1;
 
 -#error_log  logs/error.log;
 -#error_log  logs/error.log  notice;
 -#error_log  logs/error.log  info;
-+error_log   /var/log/nginx/error.log;
-+#error_log  /var/log/nginx/error.log  notice;
-+#error_log  /var/log/nginx/error.log  info;
+error_log         /var/log/nginx/error.log;
+#error_log        /var/log/nginx/error.log  notice;
+#error_log        /var/log/nginx/error.log  info;
 
 -#pid        logs/nginx.pid;
-+pid        /var/run/nginx.pid;
+pid               /var/run/nginx.pid;
 
 
+
+#----------------------------------------------------------------------
+# Events Module 
+#
+#   http://wiki.codemongers.com/NginxEventsModule
+#
+#----------------------------------------------------------------------
+
 events {
-@@ -15,14 +14,14 @@
+     worker_connections  1024;
+ }
 
 
+#----------------------------------------------------------------------
+# HTTP Core Module
+#
+#   http://wiki.codemongers.com/NginxHttpCoreModule 
+#
+#----------------------------------------------------------------------
+
 http {
-    include       conf/mime.types;
+-    include       mime.types;
 +    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
@ -38,18 +70,88 @@
 
     sendfile        on;
     #tcp_nopush     on;
-@@ -38,7 +37,7 @@
+@@ -31,27 +62,36 @@
+     keepalive_timeout  65;
+ 
+     #gzip  on;
+    
+    # Load config files from the /etc/nginx/conf.d directory
+    include /etc/nginx/conf.d/*.conf;
+ 
+    #
+    # The default server
+    #
+     server {
+-        listen       80;
+-        server_name  localhost;
+        listen       80;
+        server_name  _;
 
         #charset koi8-r;
 
-        #access_log  logs/host.access.log  main;
-+        #access_log  /var/log/nginx/host.access.log  main;
+         #access_log  logs/host.access.log  main;
 
         location / {
-             root   html;
-@@ -113,5 +112,4 @@
-     #        index  index.html index.htm;
-     #    }
-     #}
+-            root   html;
+            root   /usr/share/nginx/html;
+             index  index.html index.htm;
+         }
+ 
+-        #error_page  404              /404.html;
+        error_page  404              /404.html;
+        location = /404.html {
+            root   /usr/share/nginx/html;
+        }
+ 
+         # redirect server error pages to the static page /50x.html
+         #
+         error_page   500 502 503 504  /50x.html;
+         location = /50x.html {
+-            root   html;
+            root   /usr/share/nginx/html;
+         }
+ 
+         # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+@@ -77,42 +117,4 @@
+         #    deny  all;
+         #}
+     }
+-
+-
+-    # another virtual host using mix of IP-, name-, and port-based configuration
+-    #
+-    #server {
+-    #    listen       8000;
+-    #    listen       somename:8080;
+-    #    server_name  somename  alias  another.alias;
+-
+-    #    location / {
+-    #        root   html;
+-    #        index  index.html index.htm;
+-    #    }
+-    #}
+-
+-
+-    # HTTPS server
+-    #
+-    #server {
+-    #    listen       443;
+-    #    server_name  localhost;
+-
+-    #    ssl                  on;
+-    #    ssl_certificate      cert.pem;
+-    #    ssl_certificate_key  cert.key;
+-
+-    #    ssl_session_timeout  5m;
+-
+-    #    ssl_protocols  SSLv2 SSLv3 TLSv1;
+-    #    ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+-    #    ssl_prefer_server_ciphers   on;
+-
+-    #    location / {
+-    #        root   html;
+-    #        index  index.html index.htm;
+-    #    }
+-    #}
 -
 }
--- a/nginx-logo.png
+++ b/nginx-logo.png
--- a/nginx-upstream-fair.tgz
+++ b/nginx-upstream-fair.tgz
--- a/nginx.init
+++ b/nginx.init
@ -7,6 +7,7 @@
 #               proxy and IMAP/POP3 proxy server
 # processname: nginx
 # config:      /etc/nginx/nginx.conf
+# config:      /etc/sysconfig/nginx
 # pidfile:     /var/run/nginx.pid

 # Source function library.
@ -21,13 +22,17 @@
 nginx="/usr/sbin/nginx"
 prog=$(basename $nginx)

-[ -e /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
+NGINX_CONF_FILE="/etc/nginx/nginx.conf"
+
+[ -f /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx

 lockfile=/var/lock/subsys/nginx

 start() {
+    [ -x $nginx ] || exit 5
+    [ -f $NGINX_CONF_FILE ] || exit 6
    echo -n $"Starting $prog: "
-    daemon $nginx -c /etc/$prog/$prog.conf
+    daemon $nginx -c $NGINX_CONF_FILE
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
@ -44,11 +49,13 @@ stop() {
 }

 restart() {
+    configtest || return $?
    stop
    start
 }

 reload() {
+    configtest || return $?
    echo -n $"Reloading $prog: "
    killproc $nginx -HUP
    RETVAL=$?
@ -59,24 +66,44 @@ force_reload() {
    restart
 }

-fdr_status() {
+configtest() {
+  $nginx -t -c $NGINX_CONF_FILE
+}
+
+rh_status() {
    status $prog
 }

+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
 case "$1" in
-    start|stop|restart|reload)
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart|configtest)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
-        fdr_status
+        rh_status
        ;;
    condrestart|try-restart)
-  	[ ! -f $lockfile ] || restart
-	;;
+        rh_status_q || exit 0
+	    ;;
    *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}"
        exit 2
 esac
--- a/nginx.spec
+++ b/nginx.spec
@ -5,10 +5,11 @@
 %define nginx_logdir    %{_localstatedir}/log/nginx
 %define nginx_confdir   %{_sysconfdir}/nginx
 %define nginx_datadir   %{_datadir}/nginx
+%define nginx_webroot   %{nginx_datadir}/html

 Name:           nginx
-Version:        0.5.35
-Release:        3%{?dist}
+Version:        0.6.36
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   

@ -31,31 +32,38 @@ Requires(postun):   initscripts
 Source0:    http://sysoev.ru/nginx/nginx-%{version}.tar.gz
 Source1:    %{name}.init
 Source2:    %{name}.logrotate
+Source3:    virtual.conf
+Source4:    ssl.conf
+Source5:    nginx-upstream-fair.tgz
+Source6:    upstream-fair.conf
+Source7:    %{name}.sysconfig
+Source100:  index.html
+Source101:  poweredby.png
+Source102:  nginx-logo.png
+Source103:  50x.html
+Source104:  404.html

 # removes -Werror in upstream build scripts.  -Werror conflicts with
 # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
 Patch0:     nginx-auto-cc-gcc.patch

-# nginx has its own configure/build scripts.  These patches allow nginx
-# to install into a buildroot.
-Patch1:     nginx-auto-install.patch
-Patch2:     nginx-auto-options.patch
-
 # configuration patch to match all the Fedora paths for logs, pid files
 # etc.
-Patch3:     nginx-conf.patch
+Patch1:     nginx-conf.patch

 %description
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
-proxy server written by Igor Sysoev.
+proxy server written by Igor Sysoev.  
+
+One third party module, nginx-upstream-fair, is added
+

 %prep
 %setup -q

 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%{__tar} zxvf %{SOURCE5}

 %build
 # nginx does not utilize a standard configure script.  It has its own
@ -83,13 +91,18 @@ export DESTDIR=%{buildroot}
    --with-http_sub_module \
    --with-http_dav_module \
    --with-http_flv_module \
+    --with-http_gzip_static_module \
    --with-http_stub_status_module \
    --with-http_perl_module \
    --with-mail \
    --with-mail_ssl_module \
-    --with-cc-opt="%{optflags} $(pcre-config --cflags)"
+    --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
+    --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair
 make %{?_smp_mflags} 

+# rename the readme for nginx-upstream-fair so it doesn't conflict with the main
+# readme
+mv nginx-upstream-fair/README nginx-upstream-fair/README.nginx-upstream-fair

 %install
 rm -rf %{buildroot}
@ -102,8 +115,14 @@ find %{buildroot} -type f -name '*.so' -exec chmod 0755 {} \;
 chmod 0755 %{buildroot}%{_sbindir}/nginx
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
+%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE6} %{buildroot}%{nginx_confdir}/conf.d
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
+%{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot}
+%{__install} -p -m 0644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{buildroot}%{nginx_webroot}
+

 # convert to UTF-8 all files that give warnings.
 for textfile in CHANGES
@ -135,22 +154,25 @@ fi

 %files
 %defattr(-,root,root,-)
-%doc LICENSE CHANGES README
-%dir %{nginx_datadir}
-%dir %{nginx_datadir}/html
-%{_datadir}/%{name}/*/*
+%doc LICENSE CHANGES README nginx-upstream-fair/README.nginx-upstream-fair
+%{nginx_datadir}/
 %{_sbindir}/%{name}
 %{_mandir}/man3/%{name}.3pm.gz
 %{_initrddir}/%{name}
 %dir %{nginx_confdir}
+%dir %{nginx_confdir}/conf.d
+%config(noreplace) %{nginx_confdir}/conf.d/*.conf
 %config(noreplace) %{nginx_confdir}/win-utf
 %config(noreplace) %{nginx_confdir}/%{name}.conf.default
 %config(noreplace) %{nginx_confdir}/mime.types.default
+%config(noreplace) %{nginx_confdir}/fastcgi_params
+%config(noreplace) %{nginx_confdir}/fastcgi_params.default
 %config(noreplace) %{nginx_confdir}/koi-win
 %config(noreplace) %{nginx_confdir}/koi-utf
 %config(noreplace) %{nginx_confdir}/%{name}.conf
 %config(noreplace) %{nginx_confdir}/mime.types
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %dir %{perl_vendorarch}/auto/%{name}
 %{perl_vendorarch}/%{name}.pm
 %{perl_vendorarch}/auto/%{name}/%{name}.so
@ -160,6 +182,45 @@ fi


 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 0.6.36-1
+-  update to 0.6.36
+
+* Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-2
+- rebuild
+
+* Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-1
+- update to 0.6.35
+
+* Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.34-1
+- update to 0.6.34
+
+* Thu Dec  4 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 0.6.33-2
+- Fix inclusion of /usr/share/nginx tree => no unowned directories.
+
+* Sun Nov 23 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.33-1
+- update to 0.6.33
+
+* Tue Jul 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.32-1
+- update to 0.6.32
+- nginx now supports DESTDIR so removed the patches that enabled it 
+
+* Mon May 26 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-3
+- init script fixes
+- resolve 'listen 80 default' [#447873]
+
+* Mon May 12 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-2
+- update to 0.6.31
+
+* Sun May 11 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.30-2
+- upate to new upstream stable branch 0.6
+- added 3rd party module nginx-upstream-fair
+- added default webpages
+
+* Sun Apr 20 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.35-2
+- update init script to match recommended guidelines
+- add /etc/nginx/conf.d support [#443280]
+- use /etc/sysconfig/nginx to determine nginx.conf [#442708]
+
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.5.35-3
 - add Requires for versioned perl (libperl.so)
 - drop silly file Requires
--- a/nginx.sysconfig
+++ b/nginx.sysconfig
@ -0,0 +1,4 @@
+# Configuration file for the nginx service
+
+# set this to the location of the nginx configuration file
+NGINX_CONF_FILE=/etc/nginx/nginx.conf
--- a/poweredby.png
+++ b/poweredby.png
--- a/2
+++ b/2
@ -1 +1 @@
-1100d8a2f811777f38eff44fe6548d7e  nginx-0.5.35.tar.gz
+15cce6102a2efcf4d4acde9bb71ea6d3  nginx-0.6.36.tar.gz
--- a/ssl.conf
+++ b/ssl.conf
@ -0,0 +1,24 @@
+#
+# HTTPS server configuration
+#
+
+#server {
+#    listen       443;
+#    server_name  _;
+
+#    ssl                  on;
+#    ssl_certificate      cert.pem;
+#    ssl_certificate_key  cert.key;
+
+#    ssl_session_timeout  5m;
+
+#    ssl_protocols  SSLv2 SSLv3 TLSv1;
+#    ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+#    ssl_prefer_server_ciphers   on;
+
+#    location / {
+#        root   html;
+#        index  index.html index.htm;
+#    }
+#}
+
--- a/upstream-fair.conf
+++ b/upstream-fair.conf
@ -0,0 +1,18 @@
+#
+# This is a sample configuration to use the nginx-upstream-fair module 
+# that is included.
+#
+#  http://wiki.codemongers.com/NginxHttpUpstreamFairModule
+#
+# Change your Nginx config file's upstream block to include the 'fair'
+# directive:
+#
+
+# upstream mongrel {
+#     fair;
+#     server 127.0.0.1:5000;
+#     server 127.0.0.1:5001;
+#     server 127.0.0.1:5002;
+# }
+
+
--- a/virtual.conf
+++ b/virtual.conf
@ -0,0 +1,15 @@
+#
+# A virtual host using mix of IP-, name-, and port-based configuration
+#
+
+#server {
+#    listen       8000;
+#    listen       somename:8080;
+#    server_name  somename  alias  another.alias;
+
+#    location / {
+#        root   html;
+#        index  index.html index.htm;
+#    }
+#}
+
Author	SHA1	Message	Date
Fedora Release Engineering	f4051f0cbb	dist-git conversion	2010-07-29 04:25:49 +00:00
Bill Nottingham	a05baa5257	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:23:29 +00:00
jjh	15cc59ed45	update to 0.6.36	2009-04-11 23:29:26 +00:00
jjh	10a7efc6a7	rebuild	2009-02-19 08:49:03 +00:00
jjh	b51a55d79b	update sources for new tarball	2009-02-19 08:44:55 +00:00
jjh	43c894fdae	update to 0.6.35 upstream	2009-02-19 08:37:21 +00:00
jjh	db81e9eb9f	update to 0.6.34	2008-12-31 04:02:12 +00:00
jjh	2eb70c2808	update to 0.6.33	2008-11-23 09:06:57 +00:00
jjh	f0d21a8cd7	update to 0.6.32	2008-07-27 15:34:41 +00:00
jjh	473d84b6e6	fix initscript and default configuration	2008-05-27 04:43:34 +00:00
jjh	7b30f92a85	update to 0.6.31	2008-05-13 04:06:16 +00:00
jjh	367831252d	fix config file variable in init script	2008-05-12 05:50:00 +00:00
jjh	530e5a04b1	- upate to new upstream stable branch 0.6 - added 3rd party module nginx-upstream-fair - added default webpages - update init script to match recommended guidelines - add /etc/nginx/conf.d support [#443280] - use /etc/sysconfig/nginx to determine nginx.conf [#442708]	2008-05-12 05:30:56 +00:00
Jesse Keating	984194b398	Initialize branch F-9 for nginx	2008-04-21 06:36:28 +00:00