X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=35c277a397d5e27304aa709b220e2d25c7ff8d6c;hb=ce56fe800e103dfe7f2d1d2011942eb06313a0fb;hp=57ada6b7f99a3da8c4e38482b0214cecafbe1c75;hpb=049ae220bcdce39d661c3b330634371c92e38006;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 57ada6b7f..35c277a39 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,21 +15,6 @@ class roles {
 		include nagios::server
 	}
 
-	if has_role('bugs_base') {
-		ssl::service { 'bugs.debian.org':
-			notify  => Exec['service apache2 reload'],
-			key => true,
-		}
-		ferm::rule { 'dsa-bugs-abusers':
-			prio	=> "005",
-			rule	=> "saddr (220.243.135/24 220.243.136/24) DROP",
-		}
-	}
-	if has_role('bugs_master') {
-		ssl::service { 'bugs-devel.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
 	if has_role('manpages-dyn') {
 		include roles::manpages_dyn
 	}
@@ -124,18 +109,10 @@ class roles {
 		include roles::dns_geodns
 	}
 
-	if has_role('vote') {
-		include roles::vote
-	}
-
 	if has_role('security_tracker') {
 		include roles::security_tracker
 	}
 
-	if has_role('lists') {
-		include roles::lists
-	}
-
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -307,12 +284,4 @@ class roles {
 	if has_role('debsources') {
 		include roles::debsources
 	}
-
-	if has_role('debconf_wafer') {
-		include roles::debconf_wafer
-	}
-
-	if has_role('cdbuilder_local_mirror') {
-		include roles::cdbuilder_local_mirror
-	}
 }