summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-07 23:24:21 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-07 23:24:21 -0200
commit87df824ee0911a2749b68a194f725f0629b856d8 (patch)
treeb992e17113c8dae7483572f168f601a48480c1ed
parent262fa2c3910a476bd030d6b77e9395fa506c054a (diff)
downloadpuppet-apache-87df824ee0911a2749b68a194f725f0629b856d8.tar.gz
puppet-apache-87df824ee0911a2749b68a194f725f0629b856d8.tar.bz2
Minor fix
-rw-r--r--manifests/init.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index a3b018b..8505d7c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -92,11 +92,6 @@ class apache {
'': { $apache_error_dest = "${apache_error_folder}/index.html" }
}
- $hosting_domain = $base_domain ? {
- '' => $domain,
- default => $base_domain,
- }
-
define site($ensure = present, $docroot = false, $redirect = false,
$redirect_match = false, $protocol = 'http',
$server_alias = false, $use = false, $ticket = false,
@@ -108,6 +103,11 @@ class apache {
default => "$filename",
}
+ $hosting_domain = $base_domain ? {
+ '' => $domain,
+ default => $base_domain,
+ }
+
case $source {
true: {
file { "${apache2_sites}-available/$vhost":