X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=c6a2a57c2b131a429832dc52a96e42a24d641016;hb=2edb1b53ccd97bc257b4541ee62cc5b865418a2f;hp=431b99701eafac77062929406e9160c32be78a2e;hpb=08832b82184b83b2ad9c3fdc0d03147ba5a08eef;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 431b99701..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   = ();
@@ -90,20 +91,27 @@
 @def $zobel   = ($zobel 87.193.134.192/27); # credativ qsc
 @def $zobel   = ($zobel 94.79.138.160/29); # credativ Unitiymedia
 @def $zobel   = ($zobel 78.47.2.104/29); # baldur, bragi, saga
+@def $zobel   = ($zobel 217.6.179.48/29); # credativ DTAG
+@def $zobel   = ($zobel 62.154.226.64/27); # credativ DTAG 2
 @def $zobel   = ($zobel 92.198.42.24/29); # DG-i Office
 @def $zobel   = ($zobel 93.94.128.0/21);  # DG-i AS
 @def $zobel   = ($zobel 195.49.152.0/22); # DG-i AS
 @def $zobel   = ($zobel 194.187.64.0/22); # DG-i AS
-@def $luca    = (64.71.152.109);
-@def $paravoid = (62.217.125.135); # scrooge.tty.gr
+@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 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);
@@ -112,18 +120,19 @@
 @def $weasel6    = ($weasel6 2001:858:10f::/48); # anguilla
 @def $zobel6     = ();
 @def $zobel6     = ($zobel6 2001:6f8:1215::/48); # baldur
-@def $zobel6     = ($zobel6 2001:6f8:928::/48); # WS2 
+@def $zobel6     = ($zobel6 2001:6f8:928::/48); # WS2
 @def $zobel6     = ($zobel6 2a01:198:549::/48); # WGS20
 @def $zobel6     = ($zobel6 2a01:198:6b2::/48); # AdS20
 @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);