From 24d7e84f61f9e82bcd783f2e0912abb6ce4ace05 Mon Sep 17 00:00:00 2001
From: fabiank88 <fabiankothe@googlemail.com>
Date: Tue, 17 Nov 2015 23:25:51 +0100
Subject: [PATCH] Update vhosts-2.2.conf.j2

I wanted to be able to add some .htaccess authentication and other stuff
---
 templates/vhosts-2.2.conf.j2 | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/templates/vhosts-2.2.conf.j2 b/templates/vhosts-2.2.conf.j2
index 3c27677..c1b17a9 100644
--- a/templates/vhosts-2.2.conf.j2
+++ b/templates/vhosts-2.2.conf.j2
@@ -14,10 +14,14 @@ DirectoryIndex index.php index.html
   ServerAdmin {{ vhost.serveradmin }}
 {% endif %}
   <Directory "{{ vhost.documentroot }}">
-    AllowOverride All
-    Options -Indexes FollowSymLinks
-    Order allow,deny
-    Allow from all
+    {% if vhost.directory_parameters is defined %}
+      {{ vhost.directory_parameters }}
+    {% else %}
+      AllowOverride All
+      Options -Indexes FollowSymLinks
+      Order allow,deny
+      Allow from all
+    {% endif %}
   </Directory>
 {% if vhost.extra_parameters is defined %}
   {{ vhost.extra_parameters }}
@@ -49,10 +53,14 @@ DirectoryIndex index.php index.html
   ServerAdmin {{ vhost.serveradmin }}
 {% endif %}
   <Directory "{{ vhost.documentroot }}">
-    AllowOverride All
-    Options -Indexes FollowSymLinks
-    Order allow,deny
-    Allow from all
+    {% if vhost.directory_parameters is defined %}
+      {{ vhost.directory_parameters }}
+    {% else %}
+      AllowOverride All
+      Options -Indexes FollowSymLinks
+      Order allow,deny
+      Allow from all
+    {% endif %}
   </Directory>
 {% if vhost.extra_parameters is defined %}
   {{ vhost.extra_parameters }}