X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=bb8f2c2e3299dcadac3574c6839058fb990bca9c;hb=780ac895583acf302fa1e62f51aa98ff47a4cbff;hp=957d9a21fce929b869df8f189fc34896b9b5b620;hpb=47b37f6a9bbb69e5d90ea7e44237618c14b90608;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 957d9a21f..bb8f2c2e3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,7 +38,9 @@ node default {
 		include ganeti2
 	}
 
-	if $::hostname in [finzi,fano,fasch,field] {
+	if $::kernel == Linux {
+		include linux
+	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
 
@@ -52,7 +54,7 @@ node default {
 		} else {
 			include exim
 		}
-	} elsif $::hostname == 'bendel' {
+	} else {
 		include postfix
 	}
 
@@ -92,6 +94,18 @@ node default {
 		include roles::backports_mirror
 	}
 
+	if getfromhash($site::nodeinfo, 'ftp.d.o') {
+		include roles::ftp
+	}
+
+	if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
+		include roles::ftp_upload
+	}
+
+	if $::hostname in [bizet,morricone] {
+		include roles::backports_master
+	}
+
 	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
 		include roles::ftp-upcoming_mirror
 	}
@@ -112,12 +126,6 @@ node default {
 		include named::recursor
 	}
 
-	if $::kernel == 'Linux' {
-		include ferm
-		include ferm::per-host
-		include entropykey
-	}
-
 	if $::hostname in [diabelli,nono,spohr] {
 		include dacs
 	}
@@ -148,7 +156,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,saens,schein,santoro,steffani,valente,villa,wieck,bizet] {
+	if $::hostname in [chopin,franck,ravel] {
 		include vsftpd
 	}
 }