X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=1277a9cfdc482cd0c7b27ff460a52ba003be4b66;hb=07307bc8fa2416ce3b972d891b6fa53d93992a87;hp=d9c4accfdf46521fb889395c01e8861f85f5901e;hpb=3d94d3afb33844aa66dcb3c6e6f48711f7e865e9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d9c4accfd..1277a9cfd 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,43 +15,10 @@ class roles {
 		include nagios::server
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'buildd') {
-		include buildd
-	}
-
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'porterbox') {
-		include porterbox
-	}
-
-	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
@@ -114,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
 	}
@@ -126,20 +89,6 @@ class roles {
 		include roles::syncproxy
 	}
 
-	if has_role('static_master') {
-		include roles::static_master
-	}
-
-	if has_role('static_mirror') {
-		include roles::static_mirror
-	} elsif has_role('static_source') {
-		include roles::static_source
-	}
-
-	if has_role('weblog_provider') {
-		include roles::weblog_provider
-	}
-
 	if has_role('mailrelay') {
 		include roles::mailrelay
 	}
@@ -153,15 +102,11 @@ class roles {
 	}
 
 	if has_role('dns_primary') {
-		include named::primary
+		include roles::dns_primary
 	}
 
 	if has_role('dns_geo') {
-		include named::geodns
-	}
-
-	if has_role('weblog_destination') {
-		include roles::weblog_destination
+		include roles::dns_geodns
 	}
 
 	if has_role('vote') {
@@ -172,10 +117,6 @@ class roles {
 		include roles::security_tracker
 	}
 
-	if has_role('lists') {
-		include roles::lists
-	}
-
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -196,10 +137,6 @@ class roles {
 		include roles::tracker
 	}
 
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -215,14 +152,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('rtc') {
-		include roles::rtc
-	}
-
-	if has_role('jenkins') {
-		include roles::jenkins
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -289,13 +218,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
 	}
@@ -355,10 +277,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
 	}
@@ -371,10 +289,6 @@ class roles {
 		include roles::debsources
 	}
 
-	if has_role('ipsec') {
-		include ipsec
-	}
-
 	if has_role('debconf_wafer') {
 		include roles::debconf_wafer
 	}
@@ -382,11 +296,4 @@ class roles {
 	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
-	}
 }