Fix at $apache_server_name usage

diff --git a/manifests/init.pp b/manifests/init.pp
index 0dc8d46331ae2fdb68f264a99a37dc5342ef9195..7229f154364db5878994951945ceb63eaa2eceba 100644 (file)
--- 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 cf6f288832b36904353f447290e862d75d834a5c..f219e200412723ec761d7ea1e9c34908cdec3fbd 100644 (file)
--- 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}",
   }