[nginx/f20: 2/2] Use default.d directory

[Jamie Nguyen]

commit 63ed9340f6b4d83ade9341a4388255488e44b1f2
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 20:42:01 2014 +0100

    Use default.d directory

 nginx.conf |   68 +++++------------------------------------------------------
 nginx.spec |    9 +++++--
 2 files changed, 12 insertions(+), 65 deletions(-)
---
diff --git a/nginx.conf b/nginx.conf
index b2bbf14..ed521ca 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -35,15 +35,15 @@ http {
 
     #gzip  on;
 
+    index   index.html index.htm;
+
     # 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;
 
-    index   index.html index.htm;
-
     server {
-        listen       80;
+        listen       80 default_server;
         server_name  localhost;
         root         /usr/share/nginx/html;
 
@@ -51,6 +51,9 @@ http {
 
         #access_log  /var/log/nginx/host.access.log  main;
 
+        # Load configuration files for the default server block.
+        include /etc/nginx/default.d/*.conf;
+
         location / {
         }
 
@@ -65,64 +68,5 @@ http {
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {
         }
-
-        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-        #
-        #location ~ \.php$ {
-        #    proxy_pass   http://127.0.0.1;
-        #}
-
-        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-        #
-        #location ~ \.php$ {
-        #    root           html;
-        #    fastcgi_pass   127.0.0.1:9000;
-        #    fastcgi_index  index.php;
-        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-        #    include        fastcgi_params;
-        #}
-
-        # deny access to .htaccess files, if Apache's document root
-        # concurs with nginx's one
-        #
-        #location ~ /\.ht {
-        #    deny  all;
-        #}
     }
-
-
-    # another virtual host using mix of IP-, name-, and port-based configuration
-    #
-    #server {
-    #    listen       8000;
-    #    listen       somename:8080;
-    #    server_name  somename  alias  another.alias;
-    #    root         html;
-
-    #    location / {
-    #    }
-    #}
-
-
-    # HTTPS server
-    #
-    #server {
-    #    listen       443;
-    #    server_name  localhost;
-    #    root         html;
-
-    #    ssl                  on;
-    #    ssl_certificate      cert.pem;
-    #    ssl_certificate_key  cert.key;
-
-    #    ssl_session_timeout  5m;
-
-    #    ssl_protocols  SSLv2 SSLv3 TLSv1;
-    #    ssl_ciphers  HIGH:!aNULL:!MD5;
-    #    ssl_prefer_server_ciphers   on;
-
-    #    location / {
-    #    }
-    #}
-
 }
diff --git a/nginx.spec b/nginx.spec
index 9a84b7e..8f8d216 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -16,7 +16,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.4.7
-Release:           4%{?dist}
+Release:           5%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -185,6 +185,7 @@ install -p -D -m 0644 %{SOURCE11} \
     %{buildroot}%{_sysconfdir}/logrotate.d/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}
@@ -271,8 +272,6 @@ fi
 %{_initrddir}/nginx
 %config(noreplace) %{_sysconfdir}/sysconfig/nginx
 %endif
-%dir %{nginx_confdir}
-%dir %{nginx_confdir}/conf.d
 %config(noreplace) %{nginx_confdir}/fastcgi.conf
 %config(noreplace) %{nginx_confdir}/fastcgi.conf.default
 %config(noreplace) %{nginx_confdir}/fastcgi_params
@@ -301,8 +300,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:1.4.7-5
+- use default.d directory
+
 * Wed Oct 22 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.4.7-4
 - add vim files (#1142849)