projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no more vote.d.o on master, bellini is gone
[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
fbe9602
..
496054c
100644
(file)
--- a/
modules/ferm/templates/interfaces.conf.erb
+++ b/
modules/ferm/templates/interfaces.conf.erb
@@
-1,13
+1,13
@@
def $MUNIN_IPS = (<%=
begin
def $MUNIN_IPS = (<%=
begin
-
v4ips
.split(',').join(' ')
+
scope.lookupvar('::v4ips')
.split(',').join(' ')
rescue
''
end
%>);
def $MUNIN6_IPS = (<%=
begin
rescue
''
end
%>);
def $MUNIN6_IPS = (<%=
begin
-
v6ips == '' ? '' : v6ips
.split(',').join(' ')
+
scope.lookupvar('::v6ips') == '' ? '' : scope.lookupvar('::v6ips')
.split(',').join(' ')
rescue
''
end
rescue
''
end