X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=c6a2a57c2b131a429832dc52a96e42a24d641016;hb=836eff39ec561176cd00cc2d7b4e66e9668a25ee;hp=885fb65fb3443805b4905efd6415b52c0e174825;hpb=d38bca31855b7dde43d82d822c54515fa8f08726;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 885fb65fb..c6a2a57c2 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -83,6 +83,7 @@
 @def $weasel  = ($weasel 86.59.118.144/28); # debian@sil
 @def $weasel  = ($weasel 86.59.21.32/29); # anguilla1
 @def $weasel  = ($weasel 86.59.30.32/28); # anguilla2
+@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 $zobel   = ();
@@ -97,17 +98,19 @@
 @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 $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 62.210.122.202/32); # topinambour
 @def $master   = (82.195.75.110); # master.debian.org
-@def $people   = (5.153.231.30); # paradise.debian.org
+@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);
@@ -126,8 +129,9 @@
 @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 $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 = ();