rpms
/
nginx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into f18

This commit is contained in:
Jamie Nguyen 2013-01-30 07:31:41 +00:00
parent 64543c846d 04fa560d99
commit eea47d5274
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nginx.conf
View File

@ -38,8 +38,7 @@ http {
# Load modular configuration files from the /etc/nginx/conf.d directory. # Load modular configuration files from the /etc/nginx/conf.d directory.
# See http://nginx.org/en/docs/ngx_core_module.html#include # See http://nginx.org/en/docs/ngx_core_module.html#include
# for more information. # for more information.
# include /etc/nginx/conf.d/*.conf;
#include /etc/nginx/conf.d/*.conf;
server { server {
listen 80; listen 80;

6
nginx.spec
View File

@ -11,7 +11,7 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.2.6 Version: 1.2.6
Release: 4%{?dist} Release: 5%{?dist}
Summary: A high performance web server and reverse proxy server Summary: A high performance web server and reverse proxy server
Group: System Environment/Daemons Group: System Environment/Daemons
@ -202,6 +202,10 @@ fi
%changelog %changelog
* Wed Jan 23 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-5
- uncomment "include /etc/nginx/conf.d/*.conf by default but leave the
conf.d directory empty (#903065)
* Wed Jan 23 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-4 * Wed Jan 23 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-4
- add comment in nginx.conf regarding "include /etc/nginf/conf.d/*.conf" - add comment in nginx.conf regarding "include /etc/nginf/conf.d/*.conf"
(#903065) (#903065)