projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
re-enable puppet access
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
templates
/
conf.d-munin-interfaces.conf.erb
diff --git
a/modules/ferm/templates/conf.d-munin-interfaces.conf.erb
b/modules/ferm/templates/conf.d-munin-interfaces.conf.erb
index
f017050
..
7a4c026
100644
(file)
--- a/
modules/ferm/templates/conf.d-munin-interfaces.conf.erb
+++ b/
modules/ferm/templates/conf.d-munin-interfaces.conf.erb
@@
-1,17
+1,14
@@
def $MUNIN_IPS = (<%=
begin
def $MUNIN_IPS = (<%=
begin
- scope.lookupvar('
site
::nodeinfo')['misc']['v4addrs'].join(' ')
+ scope.lookupvar('
deprecated
::nodeinfo')['misc']['v4addrs'].join(' ')
rescue
''
end
%>);
def $MUNIN_IPS = ($MUNIN_IPS <%=
begin
rescue
''
end
%>);
def $MUNIN_IPS = ($MUNIN_IPS <%=
begin
- scope.lookupvar('
site
::nodeinfo')['misc']['v6addrs'].join(' ')
+ scope.lookupvar('
deprecated
::nodeinfo')['misc']['v6addrs'].join(' ')
rescue
''
end
%>);
rescue
''
end
%>);
-
-domain (ip ip6) { chain INPUT { daddr ($MUNIN_IPS) NOP; } }
-domain (ip ip6) { chain OUTPUT { saddr ($MUNIN_IPS) NOP; } }