Update vhost configuration

New boilerplate layout Fixes #38
webdevops · May 24, 2016 · b9c5a03 · b9c5a03
1 parent 46409cc
commit b9c5a03
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/provision/roles/boilerplate-main/templates/apache/vhost.conf.j2 b/provision/roles/boilerplate-main/templates/apache/vhost.conf.j2
@@ -12,7 +12,12 @@
 
   UseCanonicalName Off
 
-  Include /opt/docker/etc/httpd/vhost.common.conf
+  <IfVersion < 2.4>
+    Include /opt/docker/etc/httpd/vhost.common.d/*.conf
+  </IfVersion>
+  <IfVersion >= 2.4>
+    IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
+  </IfVersion>
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -21,7 +26,14 @@
   DocumentRoot "{{ vhost.documentRoot|default('<DOCUMENT_ROOT>') }}"
 
   UseCanonicalName Off
-  Include /opt/docker/etc/httpd/vhost.common.conf
+
+  <IfVersion < 2.4>
+    Include /opt/docker/etc/httpd/vhost.common.d/*.conf
+  </IfVersion>
+  <IfVersion >= 2.4>
+    IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
+  </IfVersion>
+
   Include /opt/docker/etc/httpd/vhost.ssl.conf
 </VirtualHost>
 

diff --git a/provision/roles/boilerplate-main/templates/nginx/vhost.conf.j2 b/provision/roles/boilerplate-main/templates/nginx/vhost.conf.j2
@@ -30,7 +30,7 @@ server {
         fastcgi_read_timeout 1000;
     }
 
-    include /opt/docker/etc/nginx/vhost.common.conf;
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
 }
 
 ##############
@@ -62,7 +62,7 @@ server {
         fastcgi_read_timeout 1000;
     }
 
-    include /opt/docker/etc/nginx/vhost.common.conf;
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
     include /opt/docker/etc/nginx/vhost.ssl.conf;
 }