X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=f705a4c8e562175cf10339ffc8ba13318126721d;hb=6adb6a4953c88373e100c761ae8ed471b18fb6d3;hp=b6f326004d79b8f6ac0251eb273ff6a9f82a7dc8;hpb=b4d726c0606a935fed8589f40eeae5d7c8c37cf7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index b6f326004..f705a4c8e 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -87,10 +87,11 @@
 
 @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_EASYDNS_V4 = (64.68.200.91);
+@def $HOST_EASYDNS_V4 = (64.68.200.91 205.210.42.80);
 @def $HOST_RCODE0_V4 = (83.136.34.0/27);
 @def $HOST_RCODE0_V6 = (2A02:850:8::/47);
-@def $HOST_NETNOD_V4 = (192.71.80.0/24 192.36.144.222 192.36.144.218);
+@def $HOST_NETNOD_V4 = (192.71.80.0/24 192.36.144.222 192.36.144.218 194.146.105.24 194.146.105.25);
+@def $HOST_NETNOD_V6 = (2a01:3f0:0:27::24 2a01:3f0:0:28::25);
 
 <%
 def getfastlyranges()
@@ -109,7 +110,6 @@ end
 @def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
 
 
-@def $sgran   = (91.103.132.24/29 85.158.45.51/32);
 @def $weasel  = ();
 @def $weasel  = ($weasel 86.59.118.144/28); # debian@sil
 @def $weasel  = ($weasel 86.59.21.32/29); # anguilla1
@@ -135,14 +135,12 @@ end
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 178.255.151.162); # vuizook
 @def $jcristau = ();
-@def $jcristau = ($jcristau 82.225.74.107/32); # home
+@def $jcristau = ($jcristau 82.255.47.115/32); # home
 @def $jcristau = ($jcristau 62.210.122.202/32); # topinambour
 @def $master   = (82.195.75.110); # master.debian.org
 @def $people   = (5.153.231.30); # paradis.debian.org
-@def $DSA_IPS = ($sgran $weasel $zobel $luca $tfheen $jcristau $master $people);
+@def $DSA_IPS = ($weasel $zobel $luca $tfheen $jcristau $master $people);
 
-@def $sgran6     = (2001:4b10:100b::/48);
-@def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
 @def $weasel6    = ();
 @def $weasel6    = ($weasel6 2001:826:408::/48); # unisbg
 @def $weasel6    = ($weasel6 2001:858:10f::/48); # anguilla
@@ -158,10 +156,11 @@ end
 @def $luca6      = ($luca6 2604:9a00:2010:a041:4:ffff:a2d2:c016); # jump snafu.emyr.net
 @def $tfheen6    = ();
 @def $tfheen6    = ($tfheen6 2a02:20c8:2640::/64); # vuizook
-@def $jcristau6  = (2a01:e35:2e14:a6b0::/64); # home
+@def $jcristau6  = ();
+@def $jcristau6  = ($jcristau6 2a01:e35:2ff2:f730::/61); # home
 @def $jcristau6  = ($jcristau6 2001:bc8:3f1d::/48); # topinambour
 @def $master6    = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
-@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
+@def $DSA_V6_IPS = ($weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
 
 @def $USER_christoph = ();
 #@def $USER_christoph = ($USER_christoph 212.114.250.148/31);