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

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 59852d0a0..f1ea5bb1b 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',
@@ -30,17 +31,17 @@ class exim::mx inherits exim {
 		port => 587,
 		hostname => "$::fqdn",
 	}
-	package { 'nagios-plugins-standard':
+	package { 'monitoring-plugins-standard':
 		ensure => installed,
 	}
 
 	if has_role('mailrelay') {
-		file { '/etc/cron.d/dsa-email-virtualdomains':
-			source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
-		}
-	} else {
-		file { '/etc/cron.d/dsa-email-virtualdomains':
-			ensure => absent,
+		concat::fragment { 'dsa-puppet-stuff--email-virtualdomains':
+			target => '/etc/cron.d/dsa-puppet-stuff',
+			content  => @(EOF)
+				@hourly  root if [ ! -d /etc/exim4/email-virtualdomains ]; then cd /etc/exim4 && git clone mail-git:email-virtualdomains ; fi && cd /etc/exim4/email-virtualdomains && git pull --quiet --ff-only
+				| EOF
 		}
 	}
+	file { '/etc/cron.d/dsa-email-virtualdomains': ensure => absent, }
 }