X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=65c23bc358e900816d56af842159034daaaa659a;hb=2a425a85aee59abba7f8de4b9bb6f61824938d82;hp=1837f948c08e59cf5b2b0cc9e028c60e201a6f94;hpb=9130b02a573a992eee25e39efdac3270b968b5ba;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 1837f948c..65c23bc35 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
 	}
@@ -39,7 +34,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",
 		}
@@ -158,11 +153,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 +196,6 @@ class roles {
 		include roles::tracker
 	}
 
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -394,8 +385,4 @@ class roles {
 	if has_role('anonscm') {
 		include roles::anonscm
 	}
-
-	if has_role('loghost') {
-		include syslog_ng::loghost
-	}
 }