From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 7 Jul 2019 10:15:26 +0000 (+0200)
Subject: geo ferm
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1b96ca1994e5dd41e0aa8057dedf76ad1ec4ec66;p=mirror%2Fdsa-puppet.git

geo ferm
---

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 42bb37642..536de67d7 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -87,6 +87,7 @@
 
 @def $HOST_DNS_GEO_V4 = (<%= scope.function_filter_ipv4([rolehost['dns_geo']]).uniq.join(' ') %>);
 @def $HOST_DNS_GEO_V6 = (<%= scope.function_filter_ipv6([rolehost['dns_geo']]).uniq.join(' ') %>);
+@def $HOST_DNS_GEO = ($HOST_DNS_GEO_V6 HOST_DNS_GEO_V4);
 @def $HOST_EASYDNS = (64.68.200.91 205.210.42.80);
 @def $HOST_RCODE0 = (83.136.34.0/27 2A02:850:8::/47);
 @def $HOST_NETNOD = (192.71.80.0/24 192.36.144.222 192.36.144.218 194.146.105.24 194.146.105.25 2a01:3f0:0:27::24 2a01:3f0:0:28::25);