From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 11 Dec 2011 19:46:19 +0000 (+0000)
Subject: Update home IPs for tfheen
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=45cb60e99fdf6f8c6f35acc48974d77b718a4398

Update home IPs for tfheen
---

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 5fd19fd6..e08b0c3c 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -182,7 +182,8 @@
 @def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 87.238.43.224/27); # office network
-@def $tfheen   = ($tfheen 77.40.198.10); # home
+@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);
@@ -198,8 +199,9 @@
 @def $luca6      = ();
 @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 $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 = ();