Using $apache_server_name for default nodo vhost

diff --git a/manifests/init.pp b/manifests/init.pp
index 8618042909b61cda083c72d860ba6eca57122b69..c9e71307d68bbe3137dd1c053f2fc17ab9416e93 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -404,4 +404,9 @@ class nodo::master {
        compress  => true,
        sqldump   => true,
   }
+
+  # used for trac dependency graphs
+  package { "graphviz":
+    ensure => present,
+  }
 }

diff --git a/manifests/websites.pp b/manifests/websites.pp
index ff2b1db2c3868882d35a7c3fb7c3f34b216843ff..cf6f288832b36904353f447290e862d75d834a5c 100644 (file)
--- a/manifests/websites.pp
+++ b/manifests/websites.pp
@@ -46,7 +46,7 @@ class websites::setup {
   }
 
   # Default vhost: can just be applied on the defining host
-  apache::site { "$hostname":
+  apache::site { "$apache_server_name":
     server_alias => "$domain",
     docroot      => "${apache_www_folder}",
   }