X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=ee096196d7b34f666017dfcd06e7eeaec4222588;hb=ad144c20d54eb33597becebd0734d64e7b2fdea6;hp=c30bd4cda6f7f94838abf53c5859c1ca344c0a5d;hpb=ce8ff5e8ef54888f2b4d60b45cb85377ba59eb56;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index c30bd4cda..ee096196d 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -1,6 +1,7 @@
 class exim::mx inherits exim {
 	include clamav
 	include postgrey
+	include fail2ban::exim
 
 	file { '/etc/exim4/ccTLD.txt':
 		source => 'puppet:///modules/exim/common/ccTLD.txt',
@@ -13,19 +14,6 @@ class exim::mx inherits exim {
 		notify  => Service['exim4'],
 	}
 
-	# 20181010 many connections:
-	#  188.165.219.27
-	#  125.72.232.*
-	#  140.224.61.*
-	#  117.24.36.0/22
-	#  115.235.157.28
-	#  113.110.47.180
-	#  121.226.141.*
-	@ferm::rule { 'dsa-mail-abusers':
-		prio  => "000",
-		rule  => "saddr (188.165.219.27 125.72.232.0/24 140.224.61.0/24 117.24.38.0/22 115.235.157.28 113.110.47.180 121.226.141.0/24) DROP",
-	}
-
 	# MXs used as smarthosts
 	@ferm::rule { 'dsa-exim-submission':
 		description => 'Allow SMTP',