X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=3960f1ed33f3df65a8224a43555e738df730adfe;hb=92f3de5dba7a9db8ead8e4c08fae114f5308f158;hp=22f9af6e1453e88253ad6ec6310becce1c89c817;hpb=3443e44bc5ddeb5191237f3c4111ee7e4acbc8de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 22f9af6e1..3960f1ed3 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,11 +7,6 @@
 #   include roles
 #
 class roles {
-
-	if has_role('puppetmaster') {
-		include puppetmaster
-	}
-
 	if has_role('muninmaster') {
 		include munin::master
 	}
@@ -20,16 +15,6 @@ 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
 	}
@@ -39,6 +24,10 @@ class roles {
 			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, }
@@ -154,7 +143,11 @@ class roles {
 	}
 
 	if has_role('dns_primary') {
-		include named::primary
+		include roles::dns_primary
+	}
+
+	if has_role('dns_geo') {
+		include roles::dns_geodns
 	}
 
 	if has_role('weblog_destination') {
@@ -193,10 +186,6 @@ class roles {
 		include roles::tracker
 	}
 
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -216,10 +205,6 @@ class roles {
 		include roles::rtc
 	}
 
-	if has_role('jenkins') {
-		include roles::jenkins
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -287,10 +272,10 @@ class roles {
 	}
 
 	if has_role('veyepar.debian.org') {
-		ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+		include roles::veyepar
 	}
 	if has_role('sreview.debian.org') {
-		ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+		include roles::sreview
 	}
 
 	if has_role('debtags') {
@@ -386,5 +371,4 @@ class roles {
 	if has_role('anonscm') {
 		include roles::anonscm
 	}
-
 }