projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "try to get node names this way"
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
templates
/
interfaces.conf.erb
diff --git
a/modules/ferm/templates/interfaces.conf.erb
b/modules/ferm/templates/interfaces.conf.erb
index
ee7e2c0
..
496054c
100644
(file)
--- a/
modules/ferm/templates/interfaces.conf.erb
+++ b/
modules/ferm/templates/interfaces.conf.erb
@@
-1,11
+1,17
@@
def $MUNIN_IPS = (<%=
begin
def $MUNIN_IPS = (<%=
begin
- v4ips.split(',').join(' ')
+ scope.lookupvar('::v4ips').split(',').join(' ')
+rescue
+ ''
+end
+%>);
+def $MUNIN6_IPS = (<%=
+begin
+ scope.lookupvar('::v6ips') == '' ? '' : scope.lookupvar('::v6ips').split(',').join(' ')
rescue
''
end
%>);
rescue
''
end
%>);
-def $MUNIN6_IPS = (<%= v6ips == 'no' ? '' : v6ips.split(',').join(' ') %>);
domain ip {
chain INPUT {
domain ip {
chain INPUT {