X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=51f9be53d03a0857c420438e09b5fab419fae895;hb=6f7e7e5506551b4c9d06add3a5610119de7f2bce;hp=24821537fda65d330e69610e88d60760ade7183d;hpb=2172e71093a7c0ac20deda4eab6e20fb42faa2e7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 24821537f..51f9be53d 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -17,11 +17,7 @@ class roles {
 	}
 
 	if has_role('nagiosmaster') {
-	#	include nagios::server
-		ssl::service { 'nagios.debian.org':
-			notify  => Exec['service apache2 reload'],
-			key => true,
-		}
+		include nagios::server
 	}
 
 	# XXX: turn this into a real role
@@ -43,8 +39,13 @@ 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, }
 		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
@@ -70,12 +71,6 @@ class roles {
 	if has_role('debian_mirror') {
 		include roles::debian_mirror
 	}
-	if has_role('ftp.d.o') {
-		vsftpd::site { 'ftp':
-			ensure	=> absent,
-			root	=> '/nonexistent',
-		}
-	}
 	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
@@ -102,6 +97,7 @@ class roles {
 		include roles::security_master
 		include roles::dakmaster
 	}
+
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
@@ -165,6 +161,10 @@ class roles {
 		include named::primary
 	}
 
+	if has_role('dns_geo') {
+		include named::geodns
+	}
+
 	if has_role('weblog_destination') {
 		include roles::weblog_destination
 	}
@@ -282,10 +282,18 @@ class roles {
 		include roles::dgit_git
 	}
 
-	if $::hostname in [lw01, lw02, lw03, lw04] {
+	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
 		include roles::snapshot
 	}
 
+	if has_role('snapshot_web') {
+		include roles::snapshot_web
+	}
+
+	if has_role('snapshot_shell') {
+		include roles::snapshot_shell
+	}
+
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
@@ -375,4 +383,16 @@ class roles {
 	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
+	}
+
 }