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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index e8320d4d4..35c277a39 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,33 +15,10 @@ 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
 	}
 
-	if has_role('archvsync_base_additional') {
-		include archvsync_base
-	}
-
 	# archive.debian.org
 	if has_role('historical_mirror') {
 		include roles::historical_mirror
@@ -104,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
 	}
@@ -116,10 +89,6 @@ class roles {
 		include roles::syncproxy
 	}
 
-	if has_role('weblog_provider') {
-		include roles::weblog_provider
-	}
-
 	if has_role('mailrelay') {
 		include roles::mailrelay
 	}
@@ -140,22 +109,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
 	}
@@ -191,10 +148,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('rtc') {
-		include roles::rtc
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -261,13 +214,6 @@ class roles {
 		include roles::snapshot_shell
 	}
 
-	if has_role('veyepar.debian.org') {
-		include roles::veyepar
-	}
-	if has_role('sreview.debian.org') {
-		include roles::sreview
-	}
-
 	if has_role('debtags') {
 		include roles::debtags
 	}
@@ -327,10 +273,6 @@ class roles {
 		include bacula::storage
 	}
 
-	if has_role('salsa.debian.org') {
-		include salsa
-	}
-
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}
@@ -342,23 +284,4 @@ class roles {
 	if has_role('debsources') {
 		include roles::debsources
 	}
-
-	if has_role('ipsec') {
-		include ipsec
-	}
-
-	if has_role('debconf_wafer') {
-		include roles::debconf_wafer
-	}
-
-	if has_role('cdbuilder_local_mirror') {
-		include roles::cdbuilder_local_mirror
-	}
-
-	if has_role('alioth_archive') {
-		include roles::alioth_archive
-	}
-	if has_role('anonscm') {
-		include roles::anonscm
-	}
 }