X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=4534a464824fa570abc9257b0c50bd429912fa16;hb=bc0932e7d274b8c9466bb5346bf8746010792d33;hp=89c1e1977db86935e1223c9f9afc5d8b6e1b1d55;hpb=6f13ef1cbb275fd963bd8e8aa9542cfdc91f4daf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 89c1e1977..4534a4648 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,12 +1,18 @@
 class roles::security_mirror {
 	include roles::archvsync_base
 
+	# security abusers
+	#  198.108.67.48 DoS against our rsync service
+	ferm::rule { 'dsa-security-abusers':
+		prio  => "005",
+		rule  => "saddr ( 198.108.67.48/32 ) DROP",
+	}
+
 	$binds = $::hostname ? {
 		mirror-anu      => [ '150.203.164.61', '[2001:388:1034:2900::3d]' ],
-		mirror-bytemark => [ '5.153.231.46', '[2001:41c8:1000:21::21:46]' ],
-		mirror-conova   => [ '217.196.149.233', '[2a02:16a8:dc41:100::233]' ],
 		mirror-isc      => [ '149.20.4.14', '[2001:4f8:1:c::14]' ],
 		mirror-umn      => [ '128.101.240.215', '[2607:ea00:101:3c0b::1deb:215]' ],
+		schmelzer       => [ '217.196.149.233', '[2a02:16a8:dc41:100::233]' ],
 		default         => [ '[::]' ],
 	}
 
@@ -25,7 +31,7 @@ class roles::security_mirror {
 	roles::mirror_health { 'security':
 		check_hosts   => $hosts_to_check,
 		check_service => 'security',
-		url           => 'http://security.backend.mirrors.debian.org/debian/dists/sid/Release',
+		url           => 'http://security.backend.mirrors.debian.org/debian-security/dists/stable/updates/Release',
 		health_url    => 'http://security.backend.mirrors.debian.org/_health',
         }