X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=d46bee1eae06df0688f4777d3a813de0fcd52928;hb=d06497885ecd69ba03a8c838c3ff6a4499821b44;hp=cc24123c4034bd21e71c5901b14a982bf5bd3186;hpb=ea23365c52ca8bc10262cecc74a1f23cf1cf4424;p=dsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index cc24123c..d46bee1e 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -173,29 +173,41 @@
 @def $weasel  = ($weasel 86.59.21.32/29); # anguilla1
 @def $weasel  = ($weasel 86.59.30.32/28); # anguilla2
 @def $weasel  = ($weasel 141.201.27.0/24); # came
+@def $weasel  = ($weasel 141.201.123.0/24); # cosy
 @def $weasel  = ($weasel 62.99.152.176/28); # campus sbg
 @def $zobel   = ();
 @def $zobel   = ($zobel 87.139.82.80/32); # exit.credativ.com
 @def $zobel   = ($zobel 87.193.134.192/27); # credativ qsc
 @def $zobel   = ($zobel 78.47.2.104/29); # baldur, bragi, saga
+@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 = (83.212.9.72); # faidon.noc.grnet.gr
-@def $tfheen   = (87.238.43.224/27)
+@def $tfheen   = ();
+@def $tfheen   = ($tfheen 194.31.39.0/26); # office network
+@def $tfheen   = ($tfheen 195.159.200.122); # home
+@def $tfheen   = ($tfheen 77.40.254.120/29); # home
 @def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen);
 
 @def $sgran6     = (2001:4b10:100b::/48);
 @def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
 @def $weasel6    = ();
-@def $weasel6    = ($weasel6 2001:826:408:200::/56); # came
+@def $weasel6    = ($weasel6 2001:826:408::/48); # unisbg
 @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 2a01:198:549::/48); # WGS20
 @def $zobel6     = ($zobel6 2a01:198:6b2::/48); # AdS20
+@def $zobel6     = ($zobel6 2a02:158::/32);     # DG-i AS
 @def $luca6      = ();
 @def $paravoid6  = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
-@def $tfheen6    = (2a02:c0:1013:1::/64)
+@def $tfheen6    = ();
+@def $tfheen6    = ($tfheen6 2a02:c0:1013:1::/64); # Office
+@def $tfheen6    = ($tfheen6 2001:840:f000:4007::/64); # Home, link
+@def $tfheen6    = ($tfheen6 2001:840:4007::/48); # Home
 @def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6);
 
 @def $USER_christoph = ();