From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 25 Mar 2016 20:05:40 +0000 (-0300)
Subject: Adds allow_override param into apache::site
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d36e328d3b80fb5c4615fb740e8b7a3cecf09dba;p=puppet-apache.git

Adds allow_override param into apache::site
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 19f7783..8bb878c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -30,7 +30,8 @@ define apache::site(
   $canonical            = false,
   $canonical_exceptions = '',
   $hidden_service       = false,
-  $custom_directives    = false
+  $custom_directives    = false,
+  $allow_override       = false
 ) {
 
   $vhost = $filename ? {
diff --git a/templates/site.erb b/templates/site.erb
index e2ebbf5..2ed5107 100644
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -33,6 +33,11 @@
 <% if @custom_directives != false -%>
    <%= @custom_directives %>
 <% end -%>
+<% if @allow_override != false %>
+   <Directory <%= @docroot %>>
+     AllowOverride <%= @allow_override %>
+   </Directory>
+<% end -%>
 </VirtualHost>
 # end vhost for <%= @title %>
 <% if @ssl == true %>
@@ -55,6 +60,11 @@
 <% if @custom_directives != false -%>
   <%= @custom_directives %>
 <% end -%>
+<% if @allow_override != false %>
+   <Directory <%= @docroot %>>
+     AllowOverride <%= @allow_override %>
+   </Directory>
+<% end -%>
 <% if @mpm == true %>
    <IfModule mpm_itk_module>
      AssignUserId <%= @user %> <%= @gid %>