dsa -= paravoid (rt#6248)

Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ad53e5c..3cac13b 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -34,7 +34,6 @@ class debian-org {
                'debian-admin@ftbfs.de',
                'weasel@debian.org',
                'steve@lobefin.net',
-               'paravoid@debian.org',
                'zumbi@oron.es'
        ]
 

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index b68e646..1e19a00 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -101,14 +101,13 @@
 @def $luca    = ($luca 137.82.37.25);    # jump eye.iun.ubc.ca
 @def $luca    = ($luca 50.67.19.106);    # home
 @def $luca    = ($luca 142.103.249.101); # work
-@def $paravoid = (62.217.125.135); # scrooge.tty.gr
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 195.159.200.122); # home
 @def $tfheen   = ($tfheen 77.40.254.120/29); # home
 @def $jcristau = ();
 @def $jcristau = ($jcristau 82.225.74.107/32); # home
 @def $master   = (82.195.75.110); # master.debian.org
-@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $jcristau $master);
+@def $DSA_IPS = ($sgran $weasel $zobel $luca $tfheen $jcristau $master);
 
 @def $sgran6     = (2001:4b10:100b::/48);
 @def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
@@ -123,13 +122,12 @@
 @def $zobel6     = ($zobel6 2a02:158::/32);     # DG-i AS
 @def $zobel6     = ($zobel6 2003:5b:203b::/48); # credativ DTAG v6
 @def $luca6      = ();
-@def $paravoid6  = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr
 @def $tfheen6    = ();
 @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
 @def $master6     = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
-@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6 $jcristau6 $master6);
+@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
 
 @def $USER_christoph = ();
 #@def $USER_christoph = ($USER_christoph 212.114.250.148/31);