X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=f1ea5bb1bb765c94cb4a5c686e2b12e15a0e87bf;hb=2c50e8598c18a622f9bc638a404416b48ac92711;hp=42604eb953971b0172bdb1c6d203fa186035de68;hpb=b3d9dd83da3f8ac34ccbdf912e1113f1ef49a64c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 42604eb95..f1ea5bb1b 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -14,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',
@@ -44,7 +31,7 @@ class exim::mx inherits exim {
 		port => 587,
 		hostname => "$::fqdn",
 	}
-	package { 'nagios-plugins-standard':
+	package { 'monitoring-plugins-standard':
 		ensure => installed,
 	}