X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=dc1dee0c1b40fbc82032e7a9a66e84f3173a113d;hb=c8ec38cb0dd5fe062b3597140a1bab01729c109a;hp=8bc6aa5b9112037d4d009968257ea38501191969;hpb=f941acf9c73167a6ac67fcacb1984d20c6f9930f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8bc6aa5b9..dc1dee0c1 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,7 +24,7 @@ class roles {
 			notify  => Exec['service apache2 reload'],
 			key => true,
 		}
-		@ferm::rule { 'dsa-bugs-abusers':
+		ferm::rule { 'dsa-bugs-abusers':
 			prio	=> "005",
 			rule	=> "saddr (220.243.135/24 220.243.136/24) DROP",
 		}
@@ -131,10 +116,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') {
@@ -158,11 +139,11 @@ class roles {
 	}
 
 	if has_role('dns_primary') {
-		include named::primary
+		include roles::dns_primary
 	}
 
 	if has_role('dns_geo') {
-		include named::geodns
+		include roles::dns_geodns
 	}
 
 	if has_role('weblog_destination') {
@@ -201,10 +182,6 @@ class roles {
 		include roles::tracker
 	}
 
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -224,10 +201,6 @@ class roles {
 		include roles::rtc
 	}
 
-	if has_role('jenkins') {
-		include roles::jenkins
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -394,5 +367,4 @@ class roles {
 	if has_role('anonscm') {
 		include roles::anonscm
 	}
-
 }