X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=eecf27cd6768e3529a98a41521b0d25b196c6dd4;hb=52156ca22dba8bfc48337201bf4739b9d66da838;hp=5f31bc52c0c0b82b13e7779c14261dde5dba56c4;hpb=269506f4903c881dfe71a9e383cf459b192488f1;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 5f31bc52c..eecf27cd6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -57,7 +57,7 @@ node default {
 		}
 	}
 
-	if $::hostname == 'beethoven' {
+	if $::hostname == 'backuphost' {
 		include bacula::storage
 	}
 
@@ -86,20 +86,15 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
-		include named::authoritative
-	} elsif $::hostname in [geo1,geo2,geo3] {
+	if $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
 	}
-	if $::hostname in [orff] {
-		include dnsextras::entries
-	}
 
-	if $::hostname in [diabelli,nono,spohr] {
+	if $::hostname in [diabelli,nono] {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo,rautavaara] {
+	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
 		include nfs-server
 	}