X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=adc2795adeeeabcf92951a3d511224366080ea22;hb=18f26a9ca182f25cbdfc4c1532e2d34898295e92;hp=a4445ee9b5f44e83c0cf9f3cc6dc75ecd7ca1205;hpb=4da5b456728c54fda714146477fb4d1e948725b4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a4445ee9b..adc2795ad 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -29,17 +29,6 @@ class roles {
 	if has_role('debian_mirror') {
 		include roles::debian_mirror
 	}
-	if has_role('ftp_master') {
-		include roles::ftp_master
-		include roles::dakmaster
-		include roles::signing
-	}
-	#
-	# security.debian.org
-	if has_role('security_master') {
-		include roles::security_master
-		include roles::dakmaster
-	}
 
 	if has_role('security_mirror') {
 		include roles::security_mirror
@@ -53,10 +42,6 @@ class roles {
 		include roles::snapshot
 	}
 
-	if has_role('ports_master') {
-		include roles::ports_master
-	}
-
 	if has_role('bgp') {
 		include roles::bgp
 	}