X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=2bdae0d38f7e9581d4cf82ae9572039baeb8a675;hb=b98544412fd3916437b2250481b8a77c5edef40e;hp=137cd75e4da7b839b08172ae00a21e4f35cd4967;hpb=001757dbe641c691acea373e5579a8f7f2e47fe5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 137cd75e4..2bdae0d38 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -16,7 +16,7 @@ class roles {
 		include buildd
 	}
 
-	if $::hostname in [chopin,franck,morricone,bizet] {
+	if getfromhash($site::nodeinfo, 'ftp_master') {
 		include roles::dakmaster
 	}
 
@@ -40,8 +40,14 @@ class roles {
 		include roles::ftp_upload
 	}
 
-	if $::hostname in [bizet,morricone] {
+	if getfromhash($site::nodeinfo, 'backports_master') {
 		include roles::backports_master
+		include roles::dakmaster
+	}
+
+	if getfromhash($site::nodeinfo, 'security_master') {
+		include roles::security_master
+		include roles::dakmaster
 	}
 
 	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {