Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / ferm / templates / defs.conf.erb

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index d4f8615..c2340d0 100644 (file)
--- 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
@@ -136,14 +135,12 @@ end
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 178.255.151.162); # vuizook
 @def $jcristau = ();
-@def $jcristau = ($jcristau 82.225.74.107/32); # home
+@def $jcristau = ($jcristau 82.255.47.115/32); # home
 @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
@@ -159,10 +156,11 @@ end
 @def $luca6      = ($luca6 2604:9a00:2010:a041:4:ffff:a2d2:c016); # jump snafu.emyr.net
 @def $tfheen6    = ();
 @def $tfheen6    = ($tfheen6 2a02:20c8:2640::/64); # vuizook
-@def $jcristau6  = (2a01:e35:2e14:a6b0::/64); # home
+@def $jcristau6  = ();
+@def $jcristau6  = ($jcristau6 2a01:e35:2ff2:f730::/61); # 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);