X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=5fd19fd6ad1958409daef85a148aa3a5785ea259;hb=ee981070efe9e01c10d02b6bf93fa7e38a86f90e;hp=ce77d426bd122fabe36610797da77569d2913e91;hpb=2896a9375b92d3a8e24937aa398eff3438e92af3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index ce77d426b..5fd19fd6a 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -180,7 +180,10 @@
 @def $zobel   = ($zobel 78.47.2.104/29); # baldur, bragi, saga
 @def $luca    = (64.71.152.109);
 @def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
-@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid);
+@def $tfheen   = ();
+@def $tfheen   = ($tfheen 87.238.43.224/27); # office network
+@def $tfheen   = ($tfheen 77.40.198.10); # home
+@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen);
 
 @def $sgran6     = (2001:4b10:100b::/48);
 @def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
@@ -193,8 +196,11 @@
 @def $zobel6     = ($zobel6 2a01:198:549::/48); # WGS20
 @def $zobel6     = ($zobel6 2a01:198:6b2::/48); # AdS20
 @def $luca6      = ();
-@def $paravoid6 = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
-@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6);
+@def $paravoid6  = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
+@def $tfheen6    = ();
+@def $tfheen6    = ($tfheen6 2a02:c0:1013:1::/64);
+@def $tfheen6    = ($tfheen6 2001:16d8:ee48::/48); # home
+@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6);
 
 @def $USER_christoph = ();
 @def $USER_christoph = ($USER_christoph 212.114.250.148/31);