diff options
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/init.pp | 1 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_base.conf | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index b97c4f58..191ac0c3 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -145,6 +145,7 @@ class apache { $vhost = false, $aliases = {}, $server_aliases = [], + $options = [], $enable_public_html = false) { include apache::base if ! $vhost { diff --git a/modules/apache/templates/vhost_base.conf b/modules/apache/templates/vhost_base.conf index 3baa6817..07d3f236 100644 --- a/modules/apache/templates/vhost_base.conf +++ b/modules/apache/templates/vhost_base.conf @@ -39,6 +39,12 @@ end <%= content %> +<%- if options.length -%> + <Directory <%= location %>> + Options <%= options.join(" ") %> + </Directory> +<%- end -%> + <Location /> Allow from all </Location> |