From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 11 Feb 2015 12:51:18 +0000 (+0100)
Subject: Drop no longer in use office network
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b792b2de2aa30240543756d1a582337c69c961e1;p=dsa-puppet.git

Drop no longer in use office network
---

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index c7e28b41..573906e0 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -97,7 +97,6 @@
 @def $luca    = (64.71.152.109);
 @def $paravoid = (62.217.125.135); # scrooge.tty.gr
 @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 $jcristau = ();
@@ -120,7 +119,6 @@
 @def $luca6      = ();
 @def $paravoid6  = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr
 @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 $jcristau6   = (2a01:e35:2e14:a6b0::/64); # home