[nginx/f17] Numerous bug fixes
Jamie Nguyen
jamielinux at fedoraproject.org
Sun Oct 28 15:49:25 UTC 2012
commit 467e0217cd02a14f4ba639e11c9cf9c44bf901b0
Author: Jamie Nguyen <j at jamielinux.com>
Date: Sun Oct 28 15:48:18 2012 +0000
Numerous bug fixes
README.fedora | 15 ------
default.conf | 2 +-
nginx-upgrade.8 | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
nginx.conf | 33 +-----------
nginx.spec | 44 ++++++++++------
5 files changed, 182 insertions(+), 63 deletions(-)
---
diff --git a/default.conf b/default.conf
index 33cd547..c5a6dad 100644
--- a/default.conf
+++ b/default.conf
@@ -2,7 +2,7 @@
# The default server
#
server {
- listen 80;
+ listen 80 default_server;
server_name _;
#charset koi8-r;
diff --git a/nginx-upgrade b/nginx-upgrade
old mode 100755
new mode 100644
diff --git a/nginx-upgrade.8 b/nginx-upgrade.8
new file mode 100644
index 0000000..2a435ab
--- /dev/null
+++ b/nginx-upgrade.8
@@ -0,0 +1,151 @@
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings. \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+. ds -- \(*W-
+. ds PI pi
+. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
+. ds L" ""
+. ds R" ""
+. ds C` ""
+. ds C' ""
+'br\}
+.el\{\
+. ds -- \|\(em\|
+. ds PI \(*p
+. ds L" ``
+. ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD. Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. nr % 0
+. rr F
+.\}
+.el \{\
+. de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear. Run. Save yourself. No user-serviceable parts.
+. \" fudge factors for nroff and troff
+.if n \{\
+. ds #H 0
+. ds #V .8m
+. ds #F .3m
+. ds #[ \f1
+. ds #] \fP
+.\}
+.if t \{\
+. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+. ds #V .6m
+. ds #F 0
+. ds #[ \&
+. ds #] \&
+.\}
+. \" simple accents for nroff and troff
+.if n \{\
+. ds ' \&
+. ds ` \&
+. ds ^ \&
+. ds , \&
+. ds ~ ~
+. ds /
+.\}
+.if t \{\
+. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+. \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+. \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+. \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+. ds : e
+. ds 8 ss
+. ds o a
+. ds d- d\h'-1'\(ga
+. ds D- D\h'-1'\(hy
+. ds th \o'bp'
+. ds Th \o'LP'
+. ds ae ae
+. ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "NGINX-UPGRADE 8"
+.TH NGINX-UPGRADE 8 "2012-10-28" " " " "
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+nginx\-upgrade \- tool to upgrade nginx without any downtime
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fInginx-upgrade\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+This downstream shell script updates nginx without any downtime. After
+upgrading nginx via the package manager, running this script will create
+a new nginx master. This master takes over all new requests. The old
+masters and workers are then gracefully shutdown without breaking any
+existing connections.
+.PP
+For further information, see: <http://nginx.org/en/docs/control.html>
+.SH "BUGS"
+.IX Header "BUGS"
+If you find any bugs, please send an email to the author.
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+Jamie Nguyen <jamielinux at fedoraproject.org>
diff --git a/nginx.conf b/nginx.conf
index 6116a14..1ada744 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,19 +1,6 @@
-#######################################################################
-#
-# 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
-#
-#----------------------------------------------------------------------
+# For more information on configuration, see:
+# * Official English Documentation: http://nginx.org/en/docs/
+# * Official Russian Documentation: http://nginx.org/ru/docs/
user nginx;
worker_processes 1;
@@ -25,25 +12,11 @@ error_log /var/log/nginx/error.log;
pid /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;
diff --git a/nginx.spec b/nginx.spec
index e2d808a..553adfa 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -11,7 +11,7 @@
Name: nginx
Epoch: 1
Version: 1.0.15
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A high performance web server and reverse proxy server
Group: System Environment/Daemons
@@ -28,7 +28,7 @@ Source4: default.conf
Source5: ssl.conf
Source6: virtual.conf
Source7: nginx-upgrade
-Source8: README.fedora
+Source8: nginx-upgrade.8
Source100: index.html
Source101: poweredby.png
Source102: nginx-logo.png
@@ -68,7 +68,6 @@ memory usage.
%prep
%setup -q
%patch0 -p0
-cp -a %{SOURCE8} .
%build
@@ -147,7 +146,11 @@ install -p -m 0644 %{SOURCE101} %{SOURCE102} \
install -p -m 0644 %{SOURCE103} %{SOURCE104} \
%{buildroot}%{nginx_webroot}
+install -p -D -m 0644 %{_builddir}/nginx-%{version}/man/nginx.8 \
+ %{buildroot}%{_mandir}/man8/nginx.8
+
install -p -D -m 0755 %{SOURCE7} %{buildroot}%{_bindir}/nginx-upgrade
+install -p -D -m 0644 %{SOURCE8} %{buildroot}%{_mandir}/man8/nginx-upgrade.8
%pre
@@ -179,17 +182,16 @@ fi
%postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -gt 1 ]; then
- /bin/systemctl try-restart nginx.service >/dev/null 2>&1 || :
-fi
%files
-%doc LICENSE CHANGES README README.fedora
+%doc LICENSE CHANGES README
%{nginx_datadir}/
%{_bindir}/nginx-upgrade
%{_sbindir}/nginx
-%{_mandir}/man3/nginx.3pm.gz
+%{_mandir}/man3/nginx.3pm*
+%{_mandir}/man8/nginx.8*
+%{_mandir}/man8/nginx-upgrade.8*
%{_unitdir}/nginx.service
%dir %{nginx_confdir}
%dir %{nginx_confdir}/conf.d
@@ -219,7 +221,15 @@ fi
%changelog
-* Wed May 16 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1:1.0.15-4
+* Sun Oct 28 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.15-5
+- add nginx man page (#850228)
+- add nginx-upgrade man page and remove README.fedora
+- link to official documentation instead of the community wiki (#870733)
+- do not run systemctl try-restart after package upgrade to allow the
+ administrator to run nginx-upgrade and avoid downtime
+- default.conf: add "default_server" to the "listen" directive (#842738)
+
+* Wed May 16 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.15-4
- add nginx-upgrade to replace functionality from the nginx initscript
that was lost after migration to systemd
- add README.fedora to describe usage of nginx-upgrade
@@ -230,32 +240,32 @@ fi
advice from nginx-devel
- nginx.service: use private /tmp
-* Mon May 14 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1:1.0.15-3
+* Mon May 14 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.15-3
- fix incorrect postrotate script in nginx.logrotate
-* Thu Apr 19 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1:1.0.15-2
+* Thu Apr 19 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.15-2
- renable auto-cc-gcc patch due to warnings on rawhide
-* Sat Apr 14 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1:1.0.15-1
+* Sat Apr 14 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.15-1
- update to upstream release 1.0.15
- no need to apply auto-cc-gcc patch
- add %%global _hardened_build 1
-* Thu Mar 15 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1:1.0.14-1
+* Thu Mar 15 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.14-1
- update to upstream release 1.0.14
- amend some %%changelog formatting
-* Tue Mar 06 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1:1.0.13-1
+* Tue Mar 06 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.13-1
- update to upstream release 1.0.13
- amend --pid-path and --log-path
-* Sun Mar 04 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1:1.0.12-5
+* Sun Mar 04 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.12-5
- change pid path in nginx.conf to match systemd service file
-* Sun Mar 04 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1:1.0.12-3
+* Sun Mar 04 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.12-3
- fix %%pre scriptlet
-* Mon Feb 20 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1:1.0.12-2
+* Mon Feb 20 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.0.12-2
- update upstream URL
- replace %%define with %%global
- remove obsolete BuildRoot tag, %%clean section and %%defattr
More information about the scm-commits
mailing list