From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 8 Feb 2018 16:25:54 +0000 (+0100)
Subject: remove sgran IP range. he can hop via master if needed
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=90d3081ee6baa9f582b41b34e60eecaec8fce054;p=mirror%2Fdsa-puppet.git

remove sgran IP range. he can hop via master if needed

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 d4f861518..90dbb1586 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -110,7 +110,6 @@ end
 @def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
 
 
-@def $sgran   = (91.103.132.24/29 85.158.45.51/32);
 @def $weasel  = ();
 @def $weasel  = ($weasel 86.59.118.144/28); # debian@sil
 @def $weasel  = ($weasel 86.59.21.32/29); # anguilla1
@@ -140,10 +139,8 @@ end
 @def $jcristau = ($jcristau 62.210.122.202/32); # topinambour
 @def $master   = (82.195.75.110); # master.debian.org
 @def $people   = (5.153.231.30); # paradis.debian.org
-@def $DSA_IPS = ($sgran $weasel $zobel $luca $tfheen $jcristau $master $people);
+@def $DSA_IPS = ($weasel $zobel $luca $tfheen $jcristau $master $people);
 
-@def $sgran6     = (2001:4b10:100b::/48);
-@def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
 @def $weasel6    = ();
 @def $weasel6    = ($weasel6 2001:826:408::/48); # unisbg
 @def $weasel6    = ($weasel6 2001:858:10f::/48); # anguilla
@@ -162,7 +159,7 @@ end
 @def $jcristau6  = (2a01:e35:2e14:a6b0::/64); # home
 @def $jcristau6  = ($jcristau6 2001:bc8:3f1d::/48); # topinambour
 @def $master6    = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
-@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
+@def $DSA_V6_IPS = ($weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
 
 @def $USER_christoph = ();
 #@def $USER_christoph = ($USER_christoph 212.114.250.148/31);