X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=8916c096a20efe3c0cf9dbdb0944fd9783e0ab34;hb=8532689c735ba87e8c00161224e068c2ba06f640;hp=80ed36f7e72c9b0d875733f0a0d6b374bba54e5c;hpb=96e6f8d756d861d3e1978523f509d10d426b1762;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 80ed36f7e..8916c096a 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -1,29 +1,34 @@
-class exim::mx inherits exim {
-	include clamav
-	include postgrey
+# our heavy exim class
+# @param is_mailrelay this system is a mailrelay, both in and out, for debian hosts
+class exim::mx(
+  Boolean $is_mailrelay = false,
+){
+  class { 'exim':
+    use_smarthost => false,
+    is_mailrelay  => $is_mailrelay,
+  }
 
-	file { '/etc/exim4/ccTLD.txt':
-		source => 'puppet:///modules/exim/common/ccTLD.txt',
-	}
-	file { '/etc/exim4/surbl_whitelist.txt':
-		source => 'puppet:///modules/exim/common/surbl_whitelist.txt',
-	}
-	file { '/etc/exim4/exim_surbl.pl':
-		source  => 'puppet:///modules/exim/common/exim_surbl.pl',
-		notify  => Service['exim4'],
-	}
+  include clamav
+  include postgrey
+  include fail2ban::exim
 
-	@ferm::rule { 'dsa-exim-submission':
-		description => 'Allow SMTP',
-		rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_SOURCES)'
-	}
-	@ferm::rule { 'dsa-exim-v6-submission':
-		description => 'Allow SMTP',
-		domain      => 'ip6',
-		rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
-	}
+  file { '/etc/exim4/ccTLD.txt':
+    source => 'puppet:///modules/exim/common/ccTLD.txt',
+  }
+  file { '/etc/exim4/surbl_whitelist.txt':
+    source => 'puppet:///modules/exim/common/surbl_whitelist.txt',
+  }
+  file { '/etc/exim4/exim_surbl.pl':
+    source => 'puppet:///modules/exim/common/exim_surbl.pl',
+    notify => Service['exim4'],
+  }
 
-	package { 'nagios-plugins-standard':
-		ensure => installed,
-	}
+  package { 'monitoring-plugins-standard':
+    ensure => installed,
+  }
+
+  ferm::rule::simple { 'dsa-smtp':
+    description => 'Allow smtp access from the world',
+    port        => '25',
+  }
 }