projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add pre-hook for cilea to load nf_conntrack_sip and nf_conntrack_h323
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
templates
/
defs.conf.erb
diff --git
a/modules/ferm/templates/defs.conf.erb
b/modules/ferm/templates/defs.conf.erb
index
cd89810
..
35fb7a1
100644
(file)
--- a/
modules/ferm/templates/defs.conf.erb
+++ b/
modules/ferm/templates/defs.conf.erb
@@
-48,7
+48,7
@@
@def $HOST_NAGIOS_V4 = (<%=
nagii = []
localinfo.keys.sort.each do |node|
@def $HOST_NAGIOS_V4 = (<%=
nagii = []
localinfo.keys.sort.each do |node|
- if localinfo[node]['nagiosmaster']
+ if localinfo[node]['nagiosmaster']
or localinfo[node]['extranrpeclient']
keyinfo[node][0]['ipHostNumber'].each do |ip|
next if ip =~ /:/
nagii << ip
keyinfo[node][0]['ipHostNumber'].each do |ip|
next if ip =~ /:/
nagii << ip
@@
-62,7
+62,7
@@
@def $HOST_NAGIOS_V6 = (<%=
nagii = []
localinfo.keys.sort.each do |node|
@def $HOST_NAGIOS_V6 = (<%=
nagii = []
localinfo.keys.sort.each do |node|
- if localinfo[node]['nagiosmaster']
+ if localinfo[node]['nagiosmaster']
or localinfo[node]['extranrpeclient']
keyinfo[node][0]['ipHostNumber'].each do |ip|
next if ip =~ /\./
nagii << ip
keyinfo[node][0]['ipHostNumber'].each do |ip|
next if ip =~ /\./
nagii << ip