From: Aurelien Jarno Date: Sat, 28 Sep 2019 09:21:28 +0000 (+0200) Subject: Drop HOST_DEBIAN_V4 and HOST_DEBIAN_V6 X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8cbd94706e90a31c95e923909f8977962516b4bd;p=mirror%2Fdsa-puppet.git Drop HOST_DEBIAN_V4 and HOST_DEBIAN_V6 --- 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