From 04fa560d99811b2bc85b91655348679c938a213e Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j@jamielinux.com>
Date: Wed, 23 Jan 2013 21:30:55 +0000
Subject: [PATCH] Uncomment "include /etc/nginx/conf.d/*.conf" by default

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

diff --git a/nginx.conf b/nginx.conf
index ff61ec2..ace77a2 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -38,8 +38,7 @@ http {
     # 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;
+    include /etc/nginx/conf.d/*.conf;
 
     server {
         listen       80;
diff --git a/nginx.spec b/nginx.spec
index f85e61a..551ed9a 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -11,7 +11,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.2.6
-Release:           4%{?dist}
+Release:           5%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -202,6 +202,10 @@ fi
 
 
 %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
 - add comment in nginx.conf regarding "include /etc/nginf/conf.d/*.conf"
   (#903065)