From f1b5ba4e3a794d2957762e45ec736c697267430e Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j@jamielinux.com>
Date: Wed, 23 Jan 2013 11:11:40 +0000
Subject: [PATCH] Add comment regarding /etc/nginx/conf.d directory (#903065)

---
 nginx.conf | 6 ++++++
 nginx.spec | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/nginx.conf b/nginx.conf
index 88812a4..ff61ec2 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -35,6 +35,12 @@ http {
 
     #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 {
         listen       80;
         server_name  localhost;
diff --git a/nginx.spec b/nginx.spec
index 11b55f4..f85e61a 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -11,7 +11,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.2.6
-Release:           3%{?dist}
+Release:           4%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -111,7 +111,7 @@ export DESTDIR=%{buildroot}
     --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
     --with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -202,6 +202,10 @@ fi
 
 
 %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
 - use correct file ownership when rotating log files