X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=cf85807f0deb2afde882c5441a9b6c163910649b;hb=40ea2eb95b19f449abb6f60b04caccd8e4a7510b;hp=09478211cfa0a4ac1abb8398619d8664fc9930be;hpb=8793e006b4a2d3e0c24a5315b6cd3615dd57a3bb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 09478211c..cf85807f0 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,25 +15,6 @@ class roles {
 		include nagios::server
 	}
 
-	if has_role('bugs_mirror') {
-		include roles::bugs_mirror
-	}
-
-	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
 	}
@@ -100,10 +81,6 @@ class roles {
 		ssl::service { 'cgi.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('keyring') {
-		include roles::keyring
-	}
-
 	if has_role('wiki') {
 		include roles::wiki
 	}
@@ -132,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
 	}
@@ -160,10 +129,6 @@ class roles {
 		include roles::sso_rp
 	}
 
-	if has_role('tracker') {
-		include roles::tracker
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -179,10 +144,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('rtc') {
-		include roles::rtc
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -319,12 +280,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
-	}
 }