projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b2591d
)
nagios also wants to talk smtp
author
Stephen Gran
<steve@lobefin.net>
Sat, 6 Mar 2010 12:40:44 +0000
(12:40 +0000)
committer
Stephen Gran
<steve@lobefin.net>
Sat, 6 Mar 2010 12:40:44 +0000
(12:40 +0000)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/ferm/templates/me.conf.erb
patch
|
blob
|
history
diff --git
a/modules/ferm/templates/me.conf.erb
b/modules/ferm/templates/me.conf.erb
index
690dc36
..
8ed1084
100644
(file)
--- 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