From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 7 Oct 2013 05:20:53 +0000 (+0200)
Subject: Only check out email-virtualdomains on mailrelays, not all mx-es
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cf4911b8160051b22197f9650e89b9884142018e;hp=8bdb11e51dd58922fa1ba71b2c5c8c27bfe44584;p=dsa-puppet.git

Only check out email-virtualdomains on mailrelays, not all mx-es
---

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index e035abb7..8931ec62 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -33,7 +33,13 @@ class exim::mx inherits exim {
 		ensure => installed,
 	}
 
-	file { '/etc/cron.d/dsa-email-virtualdomains':
-		source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
+	if getfromhash($site::nodeinfo, '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,
+		}
 	}
 }