X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=948127faa33b8a6be8c09011337bc75f52baa2aa;hb=e71099e47c57303bb7090e404db84ad3e8d3b75b;hp=5ee825bc4f571a333669a19f68e9af0d0337e3b7;hpb=0a9e71cc16c9887f99b5987dc31b51a5be038c46;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 5ee825bc4..948127faa 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
 	}
@@ -66,12 +47,6 @@ class roles {
 	if has_role('security_upload') {
 		include roles::security_upload
 	}
-	if has_role('api.ftp-master') {
-		ssl::service { 'api.ftp-master.debian.org':
-			notify  => Exec['service apache2 reload'],
-			key => true,
-		}
-	}
 	#
 	# security.debian.org
 	if has_role('security_master') {
@@ -100,10 +75,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
 	}
@@ -120,10 +91,6 @@ class roles {
 		include roles::pubsub
 	}
 
-	if has_role('dbmaster') {
-		include roles::dbmaster
-	}
-
 	if has_role('dns_primary') {
 		include roles::dns_primary
 	}
@@ -132,22 +99,10 @@ class roles {
 		include roles::dns_geodns
 	}
 
-	if has_role('weblog_destination') {
-		include roles::weblog_destination
-	}
-
-	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
 	}
@@ -164,17 +119,6 @@ class roles {
 		include roles::sso_rp
 	}
 
-	if has_role('tracker') {
-		include roles::tracker
-	}
-
-	if has_role('piuparts') {
-		include roles::piuparts
-	}
-	if has_role('piuparts_slave') {
-		include roles::piuparts_slave
-	}
-
 	if has_role('contributors') {
 		include roles::contributors
 	}
@@ -183,10 +127,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('rtc') {
-		include roles::rtc
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -323,12 +263,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
-	}
 }