diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-25 17:05:40 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-25 17:05:40 -0300 |
| commit | d36e328d3b80fb5c4615fb740e8b7a3cecf09dba (patch) | |
| tree | a36d1e90f38f6b56d336a5cae59bc5d6a5c05c7d | |
| parent | 10a787b642395778fa75d73ca44bdf98ffec5b01 (diff) | |
| download | puppet-apache-d36e328d3b80fb5c4615fb740e8b7a3cecf09dba.tar.gz puppet-apache-d36e328d3b80fb5c4615fb740e8b7a3cecf09dba.tar.bz2 | |
Adds allow_override param into apache::site
| -rw-r--r-- | manifests/site.pp | 3 | ||||
| -rw-r--r-- | templates/site.erb | 10 |
2 files changed, 12 insertions, 1 deletions
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 %> |