projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop HOST_DEBIAN_V4 and HOST_DEBIAN_V6
[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
dff45ac
..
84aa85d
100644
(file)
--- a/
modules/ferm/templates/defs.conf.erb
+++ b/
modules/ferm/templates/defs.conf.erb
@@
-58,10
+58,7
@@
end
%>
@def $HOST_FASTLY = (<%= getfastlyranges().join(' ') %>);
%>
@def $HOST_FASTLY = (<%= getfastlyranges().join(' ') %>);
-@def $HOST_DEBIAN_V4 = (<%= scope.function_filter_ipv4([dbs]).uniq.join(' ') %>);
-@def $HOST_DEBIAN_V6 = (<%= scope.function_filter_ipv6([dbs]).uniq.join(' ') %>);
-@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
-
+@def $HOST_DEBIAN = (<%= dbs.uniq.join(' ') %>);
@def $weasel = ();
@def $weasel = ($weasel 86.59.118.144/28); # debian@sil
@def $weasel = ();
@def $weasel = ($weasel 86.59.118.144/28); # debian@sil