X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8a09872c7533aa016b42a1ce634db6e018d0e936;hb=468d00478388aea379f1f8dbf9f6e8da8df67afb;hp=a504ecbc1b84cc32eb1c9e7a0e45e47da4a51c09;hpb=6a6f323df04506d53a2d5fb8e30765ec216877d9;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a504ecbc1..8a09872c7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,8 +35,9 @@ node default {
 	include resolv
 	include roles
 	include unbound
+	include bacula::client
 
-	if $::hostname in [pasquini,tristano,bertali,boito] {
+	if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
 		include ganeti2
 	}
 
@@ -44,11 +45,6 @@ node default {
 		include bacula::director
 	}
 
-	if $::hostname in [berlioz, biber, draghi] {
-		include bacula::client
-		@@bacula::node { $::fqdn: }
-	}
-
 	if $::hostname == 'beethoven' {
 		include bacula::storage
 	}
@@ -88,7 +84,7 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile,beach] {
+	if $::hostname in [beethoven,spohr,stabile,beach] {
 		include nfs-server
 	}
 
@@ -110,6 +106,10 @@ node default {
 		include postgres
 	}
 
+	if $::hostname in ['berlioz', 'biber', 'draghi', 'widor', 'wolkenstein'] {
+		@@bacula::node { $::fqdn: }
+	}
+
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}