X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=6accbf7417a3f844360219d0d84dfc3c83607044;hb=9f90645c16ed191842f982c489c01e9c9e6f6d96;hp=ff29abb1b560621bd03d11ae5c66d25b34a35690;hpb=e91bb90b4afe134e8e1c0781b89650997b1d4960;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ff29abb1b..6accbf741 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,33 +7,10 @@
 #   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::signing
-	}
-
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
@@ -46,14 +23,6 @@ class roles {
 		include roles::snapshot
 	}
 
-	if has_role('ports_master') {
-		include roles::ports_master
-	}
-
-	if has_role('bgp') {
-		include roles::bgp
-	}
-
 	if has_role('postgresql_server') {
 		include postgres::backup_source
 	}