X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=19359263f4f61c2b5dcdd355ed54f224f97fa54a;hb=7e9f3801f497c8f0a05094e04656f059fc903e56;hp=75bac4cca95810089d3ccb6bd8a4abb70b580fd6;hpb=6f7cf235a2677fdb7043623f25c8d8edaef7568b;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 75bac4cca..19359263f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -54,7 +54,7 @@ node default {
 		} else {
 			include exim
 		}
-	} elsif $::hostname == 'bendel' {
+	} else {
 		include postfix
 	}
 
@@ -94,6 +94,14 @@ node default {
 		include roles::backports_mirror
 	}
 
+	if getfromhash($site::nodeinfo, 'ftp.d.o') {
+		include roles::ftp
+	}
+
+	if $::hostname in [bizet,morricone] {
+		include roles::backports_master
+	}
+
 	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
 		include roles::ftp-upcoming_mirror
 	}
@@ -144,7 +152,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hostname in [chopin,franck,kassia,klecker,morricone,ravel,bizet] {
+	if $::hostname in [chopin,franck,ravel] {
 		include vsftpd
 	}
 }