[nginx/el6] Use default.d directory

[Jamie Nguyen]

commit ed4e1705ef05b791eac85a400645c3862b42d9dd
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 20:59:51 2014 +0100

    Use default.d directory

 default.conf |    3 +++
 nginx.spec   |    7 ++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/default.conf b/default.conf
index c5a6dad..8d3d766 100644
--- a/default.conf
+++ b/default.conf
@@ -9,6 +9,9 @@ server {
 
     #access_log  logs/host.access.log  main;
 
+    # Load configuration files for the default server block.
+    include /etc/nginx/default.d/*.conf;
+
     location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
diff --git a/nginx.spec b/nginx.spec
index 6fc357b..7cb3f28 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -9,7 +9,7 @@
 
 Name:              nginx
 Version:           1.0.15
-Release:           8%{?dist}
+Release:           9%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -147,6 +147,7 @@ install -p -D -m 0644 %{SOURCE7} \
     %{buildroot}%{_sysconfdir}/sysconfig/nginx
 
 install -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
+install -p -d -m 0755 %{buildroot}%{nginx_confdir}/default.d
 install -p -d -m 0700 %{buildroot}%{nginx_home}
 install -p -d -m 0700 %{buildroot}%{nginx_home_tmp}
 install -p -d -m 0700 %{buildroot}%{nginx_logdir}
@@ -234,8 +235,12 @@ fi
 %dir %{nginx_datadir}/html
 %dir %{nginx_confdir}
 %dir %{nginx_confdir}/conf.d
+%dir %{nginx_confdir}/default.d
 
 %changelog
+* Wed Oct 22 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.0.15-9
+- use default.d directory
+
 * Wed Oct 08 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.0.15-8
 - fix typo in Requires