From: Martin Zobel-Helas <zobel@debian.org>
Date: Tue, 23 Apr 2013 09:46:46 +0000 (+0200)
Subject: make master a jump host
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=217b9169058207776e1ad5e7672c391634ff5497;p=mirror%2Fdsa-puppet.git

make master a jump host
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index c7581ac55..3aaa566ba 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -189,7 +189,8 @@
 @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 $master   = (82.195.75.110); # master.debian.org
+@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $master);
 
 @def $sgran6     = (2001:4b10:100b::/48);
 @def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
@@ -208,7 +209,8 @@
 @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 master6     = (2001:41b8:202:deb:216:36ff:fe40:4001) # master.debian.org
+@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6 $master6);
 
 @def $USER_christoph = ();
 @def $USER_christoph = ($USER_christoph 212.114.250.148/31);