X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;fp=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=84aa85de19bce18499133bd9afc1c9e2a4317a08;hb=8cbd94706e90a31c95e923909f8977962516b4bd;hp=dff45ac59ae6e537151e76032bc60f34a4148a2b;hpb=ec0a5928c34bafcfd6bb24dbd1d99c4c814ae8ff;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index dff45ac59..84aa85de1 100644 --- 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_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