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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4f10b9212..eff82e77d 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,31 +7,14 @@
 #   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
-	}
 
 	if has_role('security_mirror') {
 		include roles::security_mirror
@@ -45,10 +28,6 @@ class roles {
 		include roles::snapshot
 	}
 
-	if has_role('ports_master') {
-		include roles::ports_master
-	}
-
 	if has_role('bgp') {
 		include roles::bgp
 	}