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

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 90dbb1586..f705a4c8e 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -87,7 +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_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 194.146.105.24 194.146.105.25);
@@ -135,7 +135,7 @@ 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
@@ -156,7 +156,8 @@ 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 = ($weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);