diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2011-05-08 19:12:41 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2011-05-08 19:12:41 +0000 |
| commit | 6a258072122229afebedc10968471a7dfc6a25d1 (patch) | |
| tree | 2a0e76bd5af36c876f572ce9824c8e5982cda34b | |
| parent | 0c634d79912b2d70dee01c062ade03ca2b92c7c4 (diff) | |
| download | puppet-6a258072122229afebedc10968471a7dfc6a25d1.tar puppet-6a258072122229afebedc10968471a7dfc6a25d1.tar.gz puppet-6a258072122229afebedc10968471a7dfc6a25d1.tar.bz2 puppet-6a258072122229afebedc10968471a7dfc6a25d1.tar.xz puppet-6a258072122229afebedc10968471a7dfc6a25d1.zip | |
Allow setting options in vhost base template
| -rw-r--r-- | deployment/websites/manifests/init.pp | 4 | ||||
| -rw-r--r-- | modules/apache/manifests/init.pp | 1 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_base.conf | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/deployment/websites/manifests/init.pp b/deployment/websites/manifests/init.pp index e530972e..77111630 100644 --- a/deployment/websites/manifests/init.pp +++ b/deployment/websites/manifests/init.pp @@ -53,9 +53,7 @@ class websites { $svn_location = "svn://svn.$domain/svn/web/releases/" apache::vhost_base { "releases.$domain": location => $vhostdir, - content => "<Directory $vhostdir> - Options FollowSymLinks -</Directory>" + options => [ "FollowSymLinks" ] } subversion::snapshot { "$vhostdir": 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> |