aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-07 16:54:14 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-07 16:54:14 -0200
commitc28e7f079746fb4792f540fcadd958994c5e7966 (patch)
treed9843c63901e2d0295c61805a1158c38161769a7 /manifests
parenta3529f6876eee257ec8d5c4d0723683406685c91 (diff)
downloadpuppet-nodo-c28e7f079746fb4792f540fcadd958994c5e7966.tar.gz
puppet-nodo-c28e7f079746fb4792f540fcadd958994c5e7966.tar.bz2
Using $apache_server_name for default nodo vhost
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp5
-rw-r--r--manifests/websites.pp2
2 files changed, 6 insertions, 1 deletions
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}",
}