From 9fffd8c400b8472c2778e7b4c25e52f3c647a897 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Sun, 28 Oct 2012 16:07:30 +0000 Subject: [PATCH] Numerous bug fixes --- nginx.conf | 33 +++------------------------------ nginx.spec | 20 ++++++++++++++------ 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/nginx.conf b/nginx.conf index dc8091c..58ec621 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 /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; diff --git a/nginx.spec b/nginx.spec index d0c0c6a..c855c8a 100644 --- a/nginx.spec +++ b/nginx.spec @@ -9,7 +9,7 @@ Name: nginx Version: 1.0.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -145,6 +145,8 @@ 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 %pre if [ $1 -eq 1 ]; then @@ -175,7 +177,8 @@ fi %doc LICENSE CHANGES README %{nginx_datadir}/ %{_sbindir}/nginx -%{_mandir}/man3/nginx.3pm.gz +%{_mandir}/man3/nginx.3pm* +%{_mandir}/man8/nginx.8* %{_initrddir}/nginx %dir %{nginx_confdir} %dir %{nginx_confdir}/conf.d @@ -206,18 +209,23 @@ fi %changelog -* Mon May 14 2012 Jamie Nguyen - 1.0.15-2 +* Sun Oct 28 2012 Jamie Nguyen - 1.0.15-3 +- add nginx man page (#870738) +- link to official documentation not the community wiki (#870733) +- default.conf: add "default_server" to the "listen" directive (#842738) + +* Mon May 14 2012 Jamie Nguyen - 1.0.15-2 - fix postrotate script in nginx.logrotate (#705264) -* Thu Apr 19 2012 Jamie Nguyen - 1.0.15-1 +* Thu Apr 19 2012 Jamie Nguyen - 1.0.15-1 - update to upstream release 1.0.15 - CVE-2012-2089 (#812093) -* Thu Mar 15 2012 Jamie Nguyen - 1.0.14-1 +* Thu Mar 15 2012 Jamie Nguyen - 1.0.14-1 - update to upstream release 1.0.14 - CVE-2012-1180 (#803856) -* Tue Mar 03 2012 Jamie Nguyen - 1.0.13-1 +* Tue Mar 03 2012 Jamie Nguyen - 1.0.13-1 - update to upstream release 1.0.13 - general spec file cleanup to match rawhide (for easier diff), including: - replace %%define with %%global