X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=b68e646cfb352ed847e58579873a7d2470143f86;hb=4dbb9302ed958650774c966e53e19406b1f631a3;hp=8161d85831c5f5751c21722e036a86f40a081349;hpb=cf5ebb16f1cffc6a3f059d9b77b0a45923767eb8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 8161d8583..b68e646cf 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -90,6 +90,8 @@
 @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
@@ -105,7 +107,6 @@
 @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 $master   = (82.195.75.110); # master.debian.org
 @def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $jcristau $master);
 
@@ -116,10 +117,11 @@
 @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    = ();