summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-03-21 10:58:23 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-03-21 10:58:23 -0300
commitfeab46e1814dab2ced801649344ed92c51716849 (patch)
tree7eb7ac2ad2669c06ed23737af7dc196504e85661
parent5ade2be9470c0e4292979535a217c3c477d93237 (diff)
downloadpuppet-apache-feab46e1814dab2ced801649344ed92c51716849.tar.gz
puppet-apache-feab46e1814dab2ced801649344ed92c51716849.tar.bz2
Adding 'aliases' parameter
-rw-r--r--manifests/init.pp2
-rw-r--r--templates/site.erb3
2 files changed, 4 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index f21a02d..ae7acc0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -95,7 +95,7 @@ class apache {
}
define site($ensure = present, $docroot = false, $redirect = false,
- $redirect_match = false, $protocol = 'http',
+ $redirect_match = false, $protocol = 'http', $aliases = false,
$server_alias = false, $use = false, $ticket = false,
$source = false, $template = 'apache/site.erb', $filename = '',
$manage_docroot = true, $owner = "root", $group = "root") {
diff --git a/templates/site.erb b/templates/site.erb
index 18fce97..4f5f3a1 100644
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -5,6 +5,9 @@
DocumentRoot <%= docroot %>
<% if redirect_match != false %> RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= hosting_domain %>/<%= redirect_match %><% end %>
<% if redirect != false %> Redirect <%= redirect %><% end %>
+<% if aliases != false %><% aliases.each do |map| -%>
+ Alias <%= map %>
+<% end -%><% end -%>
<% if use != false %><% use.each do |instance| -%>
Use <%= instance %>
<% end -%><% end -%>