X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=d4f8615186425000c77f71928f12bff3e3584d8c;hb=4999970bbdafaa82d0baa4dc6b8c0901c82214d0;hp=bd1d41d535338d3eded28e38cce296374e4a97f2;hpb=ca313b295cb7aa28d76169c3172d6e5bbf00e8bc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index bd1d41d53..d4f861518 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -90,7 +90,8 @@
 @def $HOST_EASYDNS_V4 = (64.68.200.91);
 @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()
@@ -132,10 +133,6 @@ end
 @def $zobel   = ($zobel 88.99.108.200/29); # buri, dag, ...
 @def $luca    = ();
 @def $luca    = ($luca 162.210.192.22);  # jump snafu.emyr.net
-@def $luca    = ($luca 162.210.192.56);  # jump pebkac.emyr.net
-@def $luca    = ($luca 137.82.37.25);    # jump eye.iun.ubc.ca
-@def $luca    = ($luca 50.67.21.146);    # home
-@def $luca    = ($luca 142.103.249.101); # work
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 178.255.151.162); # vuizook
 @def $jcristau = ();
@@ -159,6 +156,7 @@ end
 @def $zobel6     = ($zobel6 2003:5b:203b::/48); # credativ DTAG v6
 @def $zobel6     = ($zobel6 2a01:4f8:10a:1504::/64); # buri, dag, ....
 @def $luca6      = ();
+@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