From cc198fe5a065adb598259d7e794a8dedd7a26b9b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 7 Feb 2010 19:15:22 -0200
Subject: Fix at $apache_server_name usage

---
 manifests/init.pp     | 1 -
 manifests/websites.pp | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 0dc8d46..7229f15 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -33,7 +33,6 @@ class nodo {
   $ntp_timezone = "Brazil/East"
   $ntp_pool     = "south-america.pool.ntp.org"
   $ntp_servers  = [ 'a.ntp.br', 'b.ntp.br', 'c.ntp.br' ]
-  info("\$ntp_timezone: $ntp_timezone")
 
   # Monkeysphere
   #
diff --git a/manifests/websites.pp b/manifests/websites.pp
index cf6f288..f219e20 100644
--- a/manifests/websites.pp
+++ b/manifests/websites.pp
@@ -5,6 +5,11 @@ class websites::setup {
   $apache_error_dest   = "http://${domain}/missing.html"
   $drupal_folder       = "${apache_www_folder}/drupal"
 
+  case $default_vhost = $apache_server_name ? {
+    '':      { $hostname }
+    default: { $apache_server_name }
+  }
+
   # Include apache
   include apache
 
@@ -46,7 +51,7 @@ class websites::setup {
   }
 
   # Default vhost: can just be applied on the defining host
-  apache::site { "$apache_server_name":
+  apache::site { "$default_vhost":
     server_alias => "$domain",
     docroot      => "${apache_www_folder}",
   }
-- 
cgit v1.2.3