X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=cc1d521237c6fce5a1c47372c72b1256110e9061;hb=ff8cc81ab5960f98c852c95f0cc7b4f3ca377343;hp=cc82cda76cbdbec279295f92cf7d021d46cfbb41;hpb=b2c93b77262ef5c9dd89e9236ea12229c96c07bc;p=dsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index cc82cda7..cc1d5212 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -13,8 +13,6 @@ class roles {
 	#}
 
 	if getfromhash($site::nodeinfo, 'buildd') {
-		$foo = getfromhash($site::nodeinfo, 'buildd')
-		notice("Buildd is ${foo}")
 		include buildd
 	}
 
@@ -35,10 +33,6 @@ class roles {
 		include roles::www_mirror
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-		include roles::backports_mirror
-	}
-
 	if getfromhash($site::nodeinfo, 'ftp.d.o') {
 		include roles::ftp
 	}
@@ -47,11 +41,6 @@ class roles {
 		include roles::ftp_upload
 	}
 
-	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
@@ -78,4 +67,8 @@ class roles {
 	} elsif getfromhash($site::nodeinfo, 'static_source') {
 		include roles::static_source
 	}
+
+	if getfromhash($site::nodeinfo, 'weblog_provider') {
+		include roles::weblog_provider
+	}
 }