X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=af5c387c08b6601d81694e91ff2174b0cee61f7d;hb=cb2e9607cf2092ee657889e2eaee4224eadd7bfe;hp=2292139207510f2210603fa7193a59991ec76978;hpb=5e2793b3b68c31ed087cebd44881d05c5d065485;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 229213920..af5c387c0 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -73,11 +73,11 @@
 @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 getfastlyranges()
     begin
 	data = YAML.safe_load(File.open("/srv/puppet.debian.org/puppet-facts/fastly_ranges.yaml").read)
-        return data.addresses
+        return data['addresses']
     rescue
         return []
     end
@@ -98,7 +98,7 @@ end
 @def $weasel  = ($weasel 213.235.231.192/26); # sil-noreply
 @def $weasel  = ($weasel 141.201.0.0/16); # uni salzburg
 @def $weasel  = ($weasel 62.99.152.176/28); # campus sbg
-@def $weasel  = ($weasel 194.118.0.0/16); # A1 Telekom
+@def $weasel  = ($weasel 194.118.0.0/16 62.46.0.0/15); # A1 Telekom
 @def $zobel   = ();
 @def $zobel   = ($zobel 87.139.82.80/32); # exit.credativ.com
 @def $zobel   = ($zobel 87.193.134.192/27); # credativ qsc
@@ -118,8 +118,7 @@ end
 @def $luca    = ($luca 50.67.21.146);    # home
 @def $luca    = ($luca 142.103.249.101); # work
 @def $tfheen   = ();
-@def $tfheen   = ($tfheen 195.159.200.122); # home
-@def $tfheen   = ($tfheen 77.40.254.120/29); # home
+@def $tfheen   = ($tfheen 178.255.151.162); # vuizook
 @def $jcristau = ();
 @def $jcristau = ($jcristau 82.225.74.107/32); # home
 @def $jcristau = ($jcristau 62.210.122.202/32); # topinambour
@@ -142,8 +141,7 @@ end
 @def $zobel6     = ($zobel6 2a01:4f8:10a:1504::/64); # buri, dag, ....
 @def $luca6      = ();
 @def $tfheen6    = ();
-@def $tfheen6    = ($tfheen6 2001:840:f000:4007::/64); # Home, link
-@def $tfheen6    = ($tfheen6 2001:840:4007::/48); # Home
+@def $tfheen6    = ($tfheen6 2a02:20c8:2640::/64); # vuizook
 @def $jcristau6  = (2a01:e35:2e14:a6b0::/64); # home
 @def $jcristau6  = ($jcristau6 2001:bc8:3f1d::/48); # topinambour
 @def $master6    = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org