From b9c5a03ba01cf6371c6aeb37518c94be07907394 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Tue, 24 May 2016 19:48:38 +0200
Subject: [PATCH] Update vhost configuration

New boilerplate layout
Fixes #38
---
 .../templates/apache/vhost.conf.j2               | 16 ++++++++++++++--
 .../templates/nginx/vhost.conf.j2                |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/provision/roles/boilerplate-main/templates/apache/vhost.conf.j2 b/provision/roles/boilerplate-main/templates/apache/vhost.conf.j2
index 28346a8..d925d87 100644
--- 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
index e2bbdb5..e2fa150 100644
--- 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;
 }