summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-07 19:17:31 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-07 19:17:31 -0200
commitb936755f402e7be72d00d5ccb618c222fbea23fc (patch)
treeafdc6ca732f87ae4ce1f37d7c3fb5ce6ffef18ba
parent5ccb78707ac02dd2fa44be5822d712d941c21e65 (diff)
downloadpuppet-apache-b936755f402e7be72d00d5ccb618c222fbea23fc.tar.gz
puppet-apache-b936755f402e7be72d00d5ccb618c222fbea23fc.tar.bz2
Adding $apache_use_domain
-rw-r--r--manifests/init.pp5
-rw-r--r--templates/site.erb4
2 files changed, 7 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index e921255..edd84a8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -92,6 +92,11 @@ class apache {
'': { $apache_error_dest = "${apache_error_folder}/index.html" }
}
+ $use_domain = $apache_use_domain ? {
+ '' => $domain,
+ default => $apache_use_domain,
+ }
+
define site($ensure = present, $docroot = false, $redirect = false,
$redirect_match = false, $protocol = 'http',
$server_alias = false, $use = false, $ticket = false,
diff --git a/templates/site.erb b/templates/site.erb
index 1d050d6..f75c81a 100644
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -1,9 +1,9 @@
# begin vhost for <%= title %>
<VirtualHost *:80>
- ServerName <%= title %>.<%= domain %>
+ ServerName <%= title %>.<%= use_domain %>
<% if server_alias != false %> ServerAlias <%= server_alias %><% end %>
DocumentRoot <%= docroot %>
-<% if redirect_match != false %> RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= domain %>/<%= redirect_match %><% end %>
+<% if redirect_match != false %> RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= use_domain %>/<%= redirect_match %><% end %>
<% if redirect != false %> Redirect <%= redirect %><% end %>
<% if use != false %><% use.each do |instance| -%>
Use <%= instance %>