From: Stephen Gran <steve@lobefin.net>
Date: Sat, 6 Mar 2010 12:40:44 +0000 (+0000)
Subject: nagios also wants to talk smtp
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=75786fffb824d4fe6c78b0ae5f19685c6ce077cf;p=mirror%2Fdsa-puppet.git

nagios also wants to talk smtp

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 690dc369c..8ed108462 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -47,7 +47,7 @@ def $SMTP_SOURCES =(<%=
 smtpallowed = []
 
 if not nodeinfo['smarthost'].empty?
-  smtpallowed = [ '$HOST_MAILRELAY_V4' ]
+  smtpallowed = [ '$HOST_MAILRELAY_V4', '$HOST_NAGIOS_V4' ]
 end
 
 if smtpallowed.length == 0
@@ -62,7 +62,7 @@ def $SMTP_V6_SOURCES =(<%=
 smtpallowed = []
 
 if not nodeinfo['smarthost'].empty?
-  smtpallowed = [ '$HOST_MAILRELAY_V6' ]
+  smtpallowed = [ '$HOST_MAILRELAY_V6', '$HOST_NAGIOS_V6' ]
 end
 
 if smtpallowed.length == 0