From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 6 Oct 2013 19:57:09 +0000 (+0200)
Subject: Only put dsa-email-virtualdomains on the MX-es, not all machines
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=8bdb11e51dd58922fa1ba71b2c5c8c27bfe44584;p=dsa-puppet.git

Only put dsa-email-virtualdomains on the MX-es, not all machines
---

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 222b8051..46287535 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -28,9 +28,6 @@ class exim {
 		]
 	}
 
-	file { '/etc/cron.d/dsa-email-virtualdomains':
-		source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
-	}
 	file { '/etc/exim4/':
 		ensure  => directory,
 		mode    => '0755',
diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index f719e628..e035abb7 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -32,4 +32,8 @@ class exim::mx inherits exim {
 	package { 'nagios-plugins-standard':
 		ensure => installed,
 	}
+
+	file { '/etc/cron.d/dsa-email-virtualdomains':
+		source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
+	}
 }