X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=0e7ac4b40c999416a09a7a26c6a96dc2698070a6;hb=fb2d1f4e62bf2f3382ffd0584a9872b92a86572f;hp=bf0ee77ab94846bee2eb15c4fccc1ce71365f325;hpb=a3ebaa3a2ceb9da4f3ec58a0723a822a587566bd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index bf0ee77ab..0e7ac4b40 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   = ();
@@ -96,10 +97,12 @@
 @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 $zobel   = ($zobel 88.99.108.200/29); # buri, dag, ...
 @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
@@ -123,6 +126,7 @@
 @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 $zobel6     = ($zobel6 2a01:4f8:10a:1504::/64); # buri, dag, ....
 @def $luca6      = ();
 @def $tfheen6    = ();
 @def $tfheen6    = ($tfheen6 2001:840:f000:4007::/64); # Home, link