X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Ffiles%2Fmisc%2Fhoster.yaml;h=c98c491fdd6835249447625a829ee3a2c6a9e238;hb=HEAD;hp=c517189195283a4a6177655f63592a6ce313f91a;hpb=2e7ea5b5c1fd90631740fc204962b90a0409cceb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/files/misc/hoster.yaml b/modules/debian_org/files/misc/hoster.yaml
index c51718919..c98c491fd 100644
--- a/modules/debian_org/files/misc/hoster.yaml
+++ b/modules/debian_org/files/misc/hoster.yaml
@@ -10,105 +10,72 @@ accumu:
     - 130.242.6.0/24
     - 2001:6b0:e::/48
     - 2001:6b0:19::/48
+anu:
+  netrange:
+    - 150.203.164.0/24
+    - 2001:388:1034:2900::/64
 aql:
   netrange:
     - 141.170.6.144/28
-  mirror-debian: https://mirror.bytemark.co.uk/debian/
 arm:
   netrange:
     - 217.140.96.0/22
   entropy_provider_hoster: sil
-  mirror-debian: https://mirror.bytemark.co.uk/debian/
-brown:
-  netrange:
-    - 138.16.160.0/24
-  # all hosts have their own recursor
-  mirror-debian: https://mirrors.wikimedia.org/debian
 br:
   # rename to c3sl
   # University Federal do Parana (.br)
   netrange:
     - 200.17.192.0/19
+brown:
+  netrange:
+    - 138.16.160.0/24
 bytemark:
   netrange:
     - 5.153.231.0/24
     - 89.16.160.112/29
     - 2001:41c8:1000::/48
     - 2001:41c8:61::/125
-  mirror-debian: https://mirror.bytemark.co.uk/debian/
-carnet:
-  netrange:
-    - 193.198.0.0/16
-anu:
-  netrange:
-    - 150.203.164.0/24
-    - 2001:388:1034:2900::/64
 conova:
   netrange:
     - 217.196.149.224/28
-  mirror-debian: https://mirror.netcologne.de/debian/
+    - 185.69.161.160/29
 csail:
   netrange:
     - 128.31.0.0/24
-  mirror-debian: https://mirrors.wikimedia.org/debian
+    - 2603:400a:ffff:bb8::/64
 dgi:
   netrange:
     - 93.94.130.128/26
-freenet:
-  netrange:
-    - 62.104.0.0/16
 gatech:
   netrange:
     - 128.61.240.0/23
-  mirror-debian: https://mirrors.wikimedia.org/debian
 grnet:
   netrange:
     - 194.177.211.192/27
     - 2001:648:2ffc:deb::/64
-helsinki:
-  netrange:
-    - 193.167.160.0/23
-  # all hosts have their own recursor
 isc:
   netrange:
     - 149.20.0.0/16
     - 2001:4F8::/32
-uni-karlsruhe:
-  # rename to karlsruhe
-  netrange:
-    - 129.143.160.0/29
-    - 2001:7c0:400:1337::/64
-  mirror-debian: https://mirror.netcologne.de/debian/
-linaro:
-  netrange:
-    - 64.28.108.83/32
-    - 64.28.108.84/32
-    - 64.28.108.85/32
-  mirror-debian: https://mirrors.wikimedia.org/debian
+leaseweb:
+  netrange:
+    - 185.17.185.176/28
 'man-da':
   netrange:
     - 82.195.75.64/26
     - 2001:41b8:202:deb::/64
-  mirror-debian: https://mirror.netcologne.de/debian/
-leaseweb:
-  netrange:
-    - 185.17.185.176/28
 marist:
   netrange:
     - 148.100.0.0/16
-  mirror-debian: https://mirrors.wikimedia.org/debian
 osuosl:
   netrange:
     - 140.211.0.0/16
-  mirror-debian: https://mirrors.wikimedia.org/debian
 sakura:
   netrange:
     - 133.242.99.74/32
 sanger:
   netrange:
     - 193.62.202.24/29
-  #resolvoptions: [single-request]
-  mirror-debian: https://mirror.bytemark.co.uk/debian/
 scanplus:
   netrange:
     - 212.211.132.0/26
@@ -128,10 +95,6 @@ ubc:
     # old range:
     - 206.12.19.0/24
     - 2607:f8f0:610:4000::/64
-  mirror-debian: https://mirrors.wikimedia.org/debian
-ugent:
-  netrange:
-    - 157.193.0.0/16
 umn:
   netrange:
     - 128.101.240.212
@@ -142,19 +105,11 @@ utwente:
   netrange:
     - 130.89.0.0/16
     - 2001:0610:1908::/48
-  # broken with dnssec
-xs4all:
-  # should be deleted
-  netrange:
-    - 194.109.137.216/29
-    - 2001:888:2000:12::/64
 ynic:
   netrange:
     - 144.32.168.64/28
-  mirror-debian: https://mirror.bytemark.co.uk/debian/
 zivit:
   netrange:
     - 80.245.144.0/22
-  mirror-debian: https://debian.netcologne.de/debian/
 
 # vim:set et sts=2 ts=2 sw=2: