[packages/nginx] Provide the vhosts.d and webapps.d directories

[jajcus]

commit 36b3be348a3f1d1e5a7d97de9128a536e0a8d78b
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Mon Oct 14 16:24:22 2013 +0200

    Provide the vhosts.d and webapps.d directories
    
    This can be used like those for our other webservers.

 nginx-light.conf    | 3 +++
 nginx-perl.conf     | 3 +++
 nginx-standard.conf | 2 ++
 nginx.spec          | 4 +++-
 4 files changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/nginx.spec b/nginx.spec
index 9a1c2bd..e7958d6 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -378,7 +378,7 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d \
 	$RPM_BUILD_ROOT%{_localstatedir}/log/{%{name},archive/%{name}} \
 	$RPM_BUILD_ROOT%{_localstatedir}/cache/{%{name}-standard,%{name}-perl,%{name}-mail,%{name}-light} \
 	$RPM_BUILD_ROOT%{_localstatedir}/lock/subsys/{%{name}-standard,%{name}-perl,%{name}-mail,%{name}-light} \
-	$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}} \
+	$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{vhosts,webapps}.d} \
 	$RPM_BUILD_ROOT/etc/{logrotate.d,monit} \
 	$RPM_BUILD_ROOT{%{systemdunitdir},/etc/systemd/system}
 
@@ -578,6 +578,8 @@ fi
 %attr(640,root,root) %{_sysconfdir}/koi-utf
 %attr(640,root,root) %{_sysconfdir}/koi-win
 %attr(640,root,root) %{_sysconfdir}/win-utf
+%dir %{_sysconfdir}/webapps.d
+%dir %{_sysconfdir}/vhosts.d
 %attr(750,nginx,logs) %dir /var/log/archive/%{name}
 %attr(750,nginx,logs) /var/log/%{name}
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/html/*
diff --git a/nginx-light.conf b/nginx-light.conf
index 6c507e7..2a4d20f 100644
--- a/nginx-light.conf
+++ b/nginx-light.conf
@@ -40,6 +40,8 @@ http {
 			limit_conn	test-limit	15;
 		}
 
+		include webapps.d/*.conf;
+
 
 #		location /nginx_status {
 #			stub_status	on;
@@ -66,4 +68,5 @@ http {
 
     	}
 
+	include vhosts.d/*.conf;
 }
diff --git a/nginx-perl.conf b/nginx-perl.conf
index 88f7c57..be689a3 100644
--- a/nginx-perl.conf
+++ b/nginx-perl.conf
@@ -78,6 +78,8 @@ http {
 			fastcgi_read_timeout	5m;
     		}
 
+		include webapps.d/*.conf;
+
 #		location /nginx_status {
 #			stub_status	on;
 #			access_log	off;
@@ -96,4 +98,5 @@ http {
 
     	}
 
+	include vhosts.d/*.conf;
 }
diff --git a/nginx-standard.conf b/nginx-standard.conf
index 43da0e7..104300c 100644
--- a/nginx-standard.conf
+++ b/nginx-standard.conf
@@ -49,6 +49,7 @@ http {
 			limit_conn	test-limit	15;
 		}
 
+		include webapps.d/*.conf;
 
 #		location /nginx_status {
 #			stub_status	on;
@@ -75,4 +76,5 @@ http {
 
     	}
 
+	include vhosts.d/*.conf;
 }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/36b3be348a3f1d1e5a7d97de9128a536e0a8d78b