X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=a8f745ab1dddcb2596c3cce4311a239c6acf4efc;hb=056b14839b903856b01908ad8b30679948baad3d;hp=601e14400f35b782ddb9fde7734712ff811a8028;hpb=6f2b99d1b77cb7edefdeb8ed407139ef4c2bf447;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 601e14400..a8f745ab1 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -16,7 +16,12 @@ class roles {
 		include buildd
 	}
 
-	if $::hostname in [chopin,franck,morricone,bizet] {
+	if getfromhash($site::nodeinfo, 'bugs_search') {
+		include roles::bugs_search
+	}
+
+	if getfromhash($site::nodeinfo, 'ftp_master') {
+		include roles::ftp_master
 		include roles::dakmaster
 	}
 
@@ -40,12 +45,22 @@ 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, 'www_master') {
+		include roles::www_master
+	}
+
+	if getfromhash($site::nodeinfo, 'keyring') {
+		include roles::keyring
 	}
 
 	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {