aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2011-05-08 19:12:41 +0000
committerPascal Terjan <pterjan@mageia.org>2011-05-08 19:12:41 +0000
commit6a258072122229afebedc10968471a7dfc6a25d1 (patch)
tree2a0e76bd5af36c876f572ce9824c8e5982cda34b /deployment
parent0c634d79912b2d70dee01c062ade03ca2b92c7c4 (diff)
downloadpuppet-6a258072122229afebedc10968471a7dfc6a25d1.tar
puppet-6a258072122229afebedc10968471a7dfc6a25d1.tar.gz
puppet-6a258072122229afebedc10968471a7dfc6a25d1.tar.bz2
puppet-6a258072122229afebedc10968471a7dfc6a25d1.tar.xz
puppet-6a258072122229afebedc10968471a7dfc6a25d1.zip
Allow setting options in vhost base template
Diffstat (limited to 'deployment')
-rw-r--r--deployment/websites/manifests/init.pp4
1 files changed, 1 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":