[nginx/el4] Update to 0.8.55
jjh
jjh at fedoraproject.org
Tue Aug 30 03:50:09 UTC 2011
commit e93c1e55e70d326db4b7f23bada988154f25c38b
Author: Jeremy Hinegardner <jeremy at hinegardner.org>
Date: Mon Aug 29 21:37:16 2011 -0600
Update to 0.8.55
404.html | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++
50x.html | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++
index.html | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++
nginx-conf.patch | 56 -------------------------
nginx-logo.png | Bin 0 -> 370 bytes
nginx.conf | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
nginx.init | 83 ++++++++++++++++++++++++++++++-------
nginx.spec | 69 ++++++++++++++++++++++---------
nginx.sysconfig | 4 ++
poweredby.png | Bin 0 -> 3034 bytes
sources | 2 +-
ssl.conf | 24 +++++++++++
virtual.conf | 15 +++++++
13 files changed, 634 insertions(+), 93 deletions(-)
---
diff --git a/404.html b/404.html
new file mode 100644
index 0000000..c1ea31b
--- /dev/null
+++ 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
+ EPEL. 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 EPEL ]"
+ width="88" height="31" /></a>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/50x.html b/50x.html
new file mode 100644
index 0000000..ea53834
--- /dev/null
+++ 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
+ EPEL. 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 EPEL ]"
+ width="88" height="31" /></a>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..a537c15
--- /dev/null
+++ 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 EPEL</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 EPEL!</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
+ EPEL. 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 EPEL ]"
+ width="88" height="31" /></a>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/nginx-logo.png b/nginx-logo.png
new file mode 100644
index 0000000..7406ba5
Binary files /dev/null and b/nginx-logo.png differ
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..f3dc403
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,120 @@
+#######################################################################
+#
+# This is the main Nginx configuration file.
+#
+# More information about the configuration options is available on
+# * the English wiki - http://wiki.nginx.org/Main
+# * the Russian documentation - http://sysoev.ru/nginx/
+#
+#######################################################################
+
+#----------------------------------------------------------------------
+# Main Module - directives that cover basic functionality
+#
+# http://wiki.nginx.org/NginxHttpMainModule
+#
+#----------------------------------------------------------------------
+
+user nginx;
+worker_processes 1;
+
+error_log /var/log/nginx/error.log;
+#error_log /var/log/nginx/error.log notice;
+#error_log /var/log/nginx/error.log info;
+
+pid /var/run/nginx.pid;
+
+
+#----------------------------------------------------------------------
+# Events Module
+#
+# http://wiki.nginx.org/NginxHttpEventsModule
+#
+#----------------------------------------------------------------------
+
+events {
+ worker_connections 1024;
+}
+
+
+#----------------------------------------------------------------------
+# HTTP Core Module
+#
+# http://wiki.nginx.org/NginxHttpCoreModule
+#
+#----------------------------------------------------------------------
+
+http {
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
+ '"$http_user_agent" "$http_x_forwarded_for"';
+
+ access_log /var/log/nginx/access.log main;
+
+ sendfile on;
+ #tcp_nopush on;
+
+ #keepalive_timeout 0;
+ keepalive_timeout 65;
+
+ #gzip on;
+
+ #
+ # The default server
+ #
+ server {
+ listen 80;
+ server_name _;
+
+ #charset koi8-r;
+
+ #access_log logs/host.access.log main;
+
+ location / {
+ root /usr/share/nginx/html;
+ index index.html index.htm;
+ }
+
+ 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 /usr/share/nginx/html;
+ }
+
+ # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+ #
+ #location ~ \.php$ {
+ # proxy_pass http://127.0.0.1;
+ #}
+
+ # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+ #
+ #location ~ \.php$ {
+ # root html;
+ # fastcgi_pass 127.0.0.1:9000;
+ # fastcgi_index index.php;
+ # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
+ # include fastcgi_params;
+ #}
+
+ # deny access to .htaccess files, if Apache's document root
+ # concurs with nginx's one
+ #
+ #location ~ /\.ht {
+ # deny all;
+ #}
+ }
+
+ # Load config files from the /etc/nginx/conf.d directory
+ include /etc/nginx/conf.d/*.conf;
+
+}
diff --git a/nginx.init b/nginx.init
index f704d90..670fca5 100644
--- a/nginx.init
+++ b/nginx.init
@@ -1,12 +1,13 @@
#!/bin/sh
#
-# nginx - this script starts and stops the nginx daemin
+# nginx - this script starts and stops the nginx daemon
#
-# chkconfig: - 85 15
+# chkconfig: - 85 15
# description: Nginx is an HTTP(S) server, HTTP(S) reverse \
# 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,39 +49,85 @@ stop() {
}
restart() {
+ configtest_q || configtest || return 6
stop
start
}
reload() {
+ configtest_q || configtest || return 6
echo -n $"Reloading $prog: "
killproc $nginx -HUP
- RETVAL=$?
echo
}
-force_reload() {
- restart
+configtest() {
+ $nginx -t -c $NGINX_CONF_FILE
+}
+
+configtest_q() {
+ configtest >/dev/null 2>&1
}
-fdr_status() {
+rh_status() {
status $prog
}
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+# Upgrade the binary with no downtime.
+upgrade() {
+ local pidfile="/var/run/${prog}.pid"
+ local oldbin_pidfile="${pidfile}.oldbin"
+
+ configtest_q || configtest || return 6
+ echo -n $"Staring new master $prog: "
+ killproc $nginx -USR2
+ retval=$?
+ echo
+ sleep 1
+ if [[ -f ${oldbin_pidfile} && -f ${pidfile} ]]; then
+ echo -n $"Graceful shutdown of old $prog: "
+ killproc -p ${oldbin_pidfile} -QUIT
+ retval=$?
+ echo
+ return 0
+ else
+ echo $"Something bad happened, manual intervention required, maybe restart?"
+ return 1
+ fi
+}
+
case "$1" in
- start|stop|restart|reload)
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
$1
;;
- force-reload)
- force_reload
+ restart|configtest)
+ $1
+ ;;
+ force-reload|upgrade)
+ rh_status_q || exit 7
+ upgrade
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
;;
- status)
- fdr_status
+ status|status_q)
+ rh_$1
;;
condrestart|try-restart)
- [ ! -f $lockfile ] || restart
- ;;
+ rh_status_q || exit 7
+ restart
+ ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+ echo $"Usage: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}"
exit 2
esac
diff --git a/nginx.spec b/nginx.spec
index 9afa6e5..5793114 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -5,11 +5,12 @@
%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.6.39
-Release: 4%{?dist}
-Summary: Robust, small and high performance http and reverse proxy server
+Version: 0.8.55
+Release: 1%{?dist}
+Summary: Robust, small and high performance HTTP and reverse proxy server
Group: System Environment/Daemons
# BSD License (two clause)
@@ -24,22 +25,25 @@ Requires(pre): %{_sbindir}/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service
+Provides: webserver
-Source0: http://sysoev.ru/nginx/nginx-%{version}.tar.gz
+Source0: http://nginx.org/download/nginx-%{version}.tar.gz
Source1: %{name}.init
Source2: %{name}.logrotate
+Source3: virtual.conf
+Source4: ssl.conf
+Source5: %{name}.sysconfig
+Source6: nginx.conf
+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
-# configuration patch to match all the Fedora paths for logs, pid files
-# etc.
-Patch1: nginx-conf.patch
-
-# patch for http://www.kb.cert.org/vuls/id/120541
-Patch2: nginx-cve-2009-3555.patch
-
%description
Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
proxy server written by Igor Sysoev.
@@ -48,8 +52,6 @@ proxy server written by Igor Sysoev.
%setup -q
%patch0 -p0
-%patch1 -p0
-%patch2 -p0
%build
# nginx does not utilize a standard configure script. It has its own
@@ -69,18 +71,28 @@ export DESTDIR=%{buildroot}
--http-client-body-temp-path=%{nginx_home_tmp}/client_body \
--http-proxy-temp-path=%{nginx_home_tmp}/proxy \
--http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
+ --http-uwsgi-temp-path=%{nginx_home_tmp}/uwsgi \
+ --http-scgi-temp-path=%{nginx_home_tmp}/scgi \
--pid-path=%{_localstatedir}/run/%{name}.pid \
--lock-path=%{_localstatedir}/lock/subsys/%{name} \
--with-http_ssl_module \
--with-http_realip_module \
--with-http_addition_module \
+ --with-http_xslt_module \
+ --with-http_image_filter_module \
+ --with-http_geoip_module \
--with-http_sub_module \
--with-http_dav_module \
--with-http_flv_module \
+ --with-http_gzip_static_module \
+ --with-http_random_index_module \
+ --with-http_secure_link_module \
+ --with-http_degradation_module \
--with-http_stub_status_module \
--with-http_perl_module \
--with-mail \
--with-mail_ssl_module \
+ --with-ipv6 \
--with-cc-opt="%{optflags} $(pcre-config --cflags)"
make %{?_smp_mflags}
@@ -96,8 +108,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 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
+%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{buildroot}%{nginx_confdir}/conf.d
+%{__install} -p -m 0644 %{SOURCE6} %{buildroot}%{nginx_confdir}
%{__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
@@ -111,10 +129,14 @@ done
rm -rf %{buildroot}
%pre
-%{_sbindir}/useradd -c "Nginx user" -s /bin/false -r -d %{nginx_home} %{nginx_user} 2>/dev/null || :
+if [ $1 == 1 ]; then
+ %{_sbindir}/useradd -c "Nginx user" -s /bin/false -r -d %{nginx_home} %{nginx_user} 2>/dev/null || :
+fi
%post
-/sbin/chkconfig --add %{name}
+if [ $1 == 1 ]; then
+ /sbin/chkconfig --add %{name}
+fi
%preun
if [ $1 = 0 ]; then
@@ -130,24 +152,31 @@ fi
%files
%defattr(-,root,root,-)
%doc LICENSE CHANGES README
-%dir %{nginx_datadir}
-%dir %{nginx_datadir}/html
-%{_datadir}/%{name}/*/*
+%{nginx_datadir}/
%{_sbindir}/%{name}
%{_mandir}/man3/%{name}.3pm.gz
%{_initrddir}/%{name}
%dir %{nginx_confdir}
+%dir %{nginx_confdir}/conf.d
%dir %{nginx_logdir}
+%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.conf
+%config(noreplace) %{nginx_confdir}/fastcgi.conf.default
+%config(noreplace) %{nginx_confdir}/fastcgi_params
+%config(noreplace) %{nginx_confdir}/fastcgi_params.default
+%config(noreplace) %{nginx_confdir}/scgi_params
+%config(noreplace) %{nginx_confdir}/scgi_params.default
+%config(noreplace) %{nginx_confdir}/uwsgi_params
+%config(noreplace) %{nginx_confdir}/uwsgi_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) %{nginx_confdir}/fastcgi_params
-%config(noreplace) %{nginx_confdir}/fastcgi_params.default
%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
diff --git a/nginx.sysconfig b/nginx.sysconfig
new file mode 100644
index 0000000..8ba359b
--- /dev/null
+++ 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
diff --git a/poweredby.png b/poweredby.png
new file mode 100644
index 0000000..0aa96cf
Binary files /dev/null and b/poweredby.png differ
diff --git a/sources b/sources
index dded03f..55e3082 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c22787fe88e37d694e773f1dda52005 nginx-0.6.39.tar.gz
+10ea2cd34f894631bf4b306b7139195b nginx-0.8.55.tar.gz
diff --git a/ssl.conf b/ssl.conf
new file mode 100644
index 0000000..e5bbce1
--- /dev/null
+++ 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;
+# }
+#}
+
diff --git a/virtual.conf b/virtual.conf
new file mode 100644
index 0000000..479ff5e
--- /dev/null
+++ 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;
+# }
+#}
+
More information about the scm-commits
mailing list