From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 7 Feb 2010 18:54:14 +0000 (-0200)
Subject: Using $apache_server_name for default nodo vhost
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c28e7f079746fb4792f540fcadd958994c5e7966;p=puppet-nodo.git

Using $apache_server_name for default nodo vhost
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 8618042..c9e7130 100644
--- 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 ff2b1db..cf6f288 100644
--- 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}",
   }