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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index eff82e77d..fb571c56f 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,15 +7,6 @@
 #   include roles
 #
 class roles {
-	if has_role('nagiosmaster') {
-		include nagios::server
-	}
-
-	# ftp.debian.org and its ecosystem
-	if has_role('debian_mirror') {
-		include roles::debian_mirror
-	}
-
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
@@ -28,10 +19,6 @@ class roles {
 		include roles::snapshot
 	}
 
-	if has_role('bgp') {
-		include roles::bgp
-	}
-
 	if has_role('postgresql_server') {
 		include postgres::backup_source
 	}