X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=39eaeb6a22877046f316a77958ad598ad8d912ac;hb=276a9b003a02fe813d16a928dc8676eb5176f186;hp=2b52656d1fbcdf264370a69b80ba2df11f6e9d3b;hpb=25362937c42aeb0d8d39b62de9d8cce4f73675a8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 2b52656d1..39eaeb6a2 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -97,19 +97,20 @@
 @def $zobel   = ($zobel 195.49.152.0/22); # DG-i AS
 @def $zobel   = ($zobel 194.187.64.0/22); # DG-i AS
 @def $luca    = ();
-@def $luca    = ($luca 69.4.89.5);       # jump fubar.emyr.net
+@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.19.106);    # home
+@def $luca    = ($luca 50.67.21.146);    # home
 @def $luca    = ($luca 142.103.249.101); # work
-@def $paravoid = (62.217.125.135); # scrooge.tty.gr
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 195.159.200.122); # home
 @def $tfheen   = ($tfheen 77.40.254.120/29); # home
 @def $jcristau = ();
 @def $jcristau = ($jcristau 82.225.74.107/32); # home
-@def $jcristau = ($jcristau 109.190.188.123/32 109.190.188.138/32 109.190.107.82/32); # office
+@def $jcristau = ($jcristau 62.210.122.202/32); # topinambour
 @def $master   = (82.195.75.110); # master.debian.org
-@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $jcristau $master);
+@def $people   = (5.153.231.30); # paradis.debian.org
+@def $DSA_IPS = ($sgran $weasel $zobel $luca $tfheen $jcristau $master $people);
 
 @def $sgran6     = (2001:4b10:100b::/48);
 @def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
@@ -124,13 +125,13 @@
 @def $zobel6     = ($zobel6 2a02:158::/32);     # DG-i AS
 @def $zobel6     = ($zobel6 2003:5b:203b::/48); # credativ DTAG v6
 @def $luca6      = ();
-@def $paravoid6  = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr
 @def $tfheen6    = ();
 @def $tfheen6    = ($tfheen6 2001:840:f000:4007::/64); # Home, link
 @def $tfheen6    = ($tfheen6 2001:840:4007::/48); # Home
-@def $jcristau6   = (2a01:e35:2e14:a6b0::/64); # home
-@def $master6     = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
-@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6 $jcristau6 $master6);
+@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
+@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
 
 @def $USER_christoph = ();
 #@def $USER_christoph = ($USER_christoph 212.114.250.148/31);