X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=eff82e77ddd6377e4f7d952417aa7ad800321108;hb=6f10c816da4e6a1b8e917214f0bcb9001602523c;hp=3088d1e5c8e432ee13ec1177643d4479ae12ee5e;hpb=a6dec5b4a7f89cb14c6d50ab5febccc12a195004;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3088d1e5c..eff82e77d 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,48 +7,19 @@
 #   include roles
 #
 class roles {
-	if has_role('muninmaster') {
-		include munin::master
-	}
-
 	if has_role('nagiosmaster') {
 		include nagios::server
 	}
 
-	# archive.debian.org
-	if has_role('historical_mirror') {
-		include roles::historical_mirror
-	}
-
-	# debug archive
-	if has_role('debug_mirror') {
-		include roles::debug_mirror
-	}
-
 	# ftp.debian.org and its ecosystem
 	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
 	}
 
-	if has_role('syncproxy') {
-		include roles::syncproxy
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -57,10 +28,6 @@ class roles {
 		include roles::snapshot
 	}
 
-	if has_role('ports_master') {
-		include roles::ports_master
-	}
-
 	if has_role('bgp') {
 		include roles::bgp
 	}