X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=eecf27cd6768e3529a98a41521b0d25b196c6dd4;hb=e1a3c8e7d6e6baac9db3156337ab3760639f7895;hp=32b06280f8cf0e26b79358790f13e022c3aa83d0;hpb=2863bac22b35c899eb01b5b6011584ea8c889efc;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 32b06280f..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,14 +86,9 @@ 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] {
 		include dacs