rpms/nginx
5
0
Fork 1
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f18

Browse Source
This commit is contained in:
Jamie Nguyen 2013-01-23 11:13:26 +00:00
commit 64543c846d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nginx.conf
View File

@ -35,6 +35,12 @@ http {
#gzip on; #gzip on;
# Load modular configuration files from the /etc/nginx/conf.d directory.
# See http://nginx.org/en/docs/ngx_core_module.html#include
# for more information.
#
#include /etc/nginx/conf.d/*.conf;
server { server {
listen 80; listen 80;
server_name localhost; server_name localhost;

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: 3%{?dist} Release: 4%{?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-4
- add comment in nginx.conf regarding "include /etc/nginf/conf.d/*.conf"
(#903065)
* Wed Dec 19 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-3 * Wed Dec 19 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-3
- use correct file ownership when rotating log files - use correct file ownership when rotating log files