X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2593be0baa047e022dc13b25d866a6acc4798499;hb=4735d5cfacb06543383fa2857e64bddd587c9544;hp=51c46711539b3d589fcf3d87530c5e5eb700c047;hpb=7c53343268f57db530dc6c558a5422b7dc0047cd;p=mirror%2Fdsa-puppet.git diff --git a/manifests/site.pp b/manifests/site.pp index 51c467115..2593be0ba 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -12,6 +12,7 @@ File { node default { include munin-node include samhain + include sudo include debian-org case $smartarraycontroller { @@ -37,11 +38,23 @@ node default { case $apache2 { "true": { case $hostname { - "carver": { import "apache2" } + "carver": { include apache2 } default: {} } } default: {} } + + case $hostname { + brahms,goetz,lafayette,malo,praetorius,puccini: + { include buildd } + default: {} + } + case $hostname { + geo1,geo2,geo3: + { include geodns } + default: {} + } + } node penalosa inherits default {