Revert "mirror.bytemark is quite slow at sanger. Use ukdebian.mirror.anlx.net instead"

[dsa-puppet.git] / modules / debian-org / misc / hoster.yaml

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index ff008e7b7d48711c8d7826bef6732297600f55bc..9580873c844bfec3edb58e93c367338a5db97102 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -2,6 +2,7 @@
 1und1:
   netrange:
     - 87.106.0.0/16
+    - 213.165.95.6/32
     - 2001:8d8:81:1520::/64
   mirror-debian: http://mirror.1und1.de/debian
   # for i in `awk '$1=="nameserver" {print $2}' /etc/resolv.conf; [ -e /etc/unbound/unbound.conf ] && awk '$1=="forward-addr:" {print $2}' /etc/unbound/unbound.conf`; do dig +dnssec @$i -t ns . | grep RRSIG || echo BROKEN; echo;echo $i; echo;read; done
@@ -17,10 +18,15 @@ accumu:
     - 2001:06B0:000E::/48
   searchpaths: [debprivate-accumu.debian.org]
   nameservers: [130.239.18.145, 130.239.1.90, 130.239.4.100]
+aql:
+  netrange:
+    - 141.170.6.144/28
+  mirror-debian: http://ftp.uk.debian.org/debian/
 arm:
   netrange:
     - 217.140.96.0/22
   entropy_provider_hoster: sil
+  mirror-debian: http://mirror.bytemark.co.uk/debian/
 brainfood:
   netrange:
     - 70.103.162.0/24
@@ -71,7 +77,6 @@ csail:
 dgi:
   netrange:
     - 93.94.130.128/26
-  nameservers: [195.49.152.215, 195.49.152.213, 195.49.152.214]
 freenet:
   netrange:
     - 62.104.0.0/16
@@ -91,6 +96,7 @@ grnet:
     - 2001:648:2ffc:deb::/64
   searchpaths: [debprivate-grnet.debian.org]
   nameservers: [194.177.210.10, 194.177.210.210]
+  mirror-debian: http://ftp.gr.debian.org/debian/
 helsinki:
   netrange:
     - 193.167.160.0/23
@@ -110,6 +116,12 @@ uni-karlsruhe:
     - 2001:7c0:400:1337::/64
   nameservers: []
   mirror-debian: http://ftp-stud.hs-esslingen.de/debian/
+linaro:
+  netrange:
+    - 64.28.108.83/32
+    - 64.28.108.84/32
+    - 64.28.108.85/32
+  mirror-debian: http://ftp.us.debian.org/debian/
 'man-da':
   netrange:
     - 82.195.75.64/26
@@ -117,26 +129,31 @@ uni-karlsruhe:
   searchpaths: [debprivate-darmstadt.debian.org]
   #nameservers: [82.195.66.249, 217.198.242.225]
   nameservers: [82.195.75.109, 82.195.75.103]
-  mirror-debian: http://debian.netcologne.de/debian/
+  #mirror-debian: http://debian.netcologne.de/debian/ [currently unstable]
+  mirror-debian: http://ftp.de.debian.org/debian/
 leaseweb:
   netrange:
     - 185.17.185.176/28
   mirror-debian: http://mirror.nl.leaseweb.net/debian/
 marist:
   netrange:
-    - 148.100.96.0/25
+    - 148.100.0.0/16
+  mirror-debian: http://ftp.us.debian.org/debian/
   nameservers: []
 osuosl:
   netrange:
-    - 140.211.166.0/25
-    - 140.211.15.0/24
+    - 140.211.0.0/16
   mirror-debian: http://debian.osuosl.org/debian
+sakura:
+  netrange:
+    - 133.242.99.74/32
 sanger:
   netrange:
     - 193.62.202.24/29
   # broken with dnssec
   # nameservers: [193.62.203.96, 193.62.203.97]
   #resolvoptions: [single-request]
+  mirror-debian: http://mirror.bytemark.co.uk/debian/
   nameservers: [193.62.202.28, 193.62.202.29]
   searchpaths: [debprivate-sanger.debian.org]
 rapidswitch:
@@ -161,7 +178,9 @@ ubcece:
     - 206.12.19.0/24
   searchpaths: [debprivate-ubc.debian.org]
   mirror-debian: http://mirror-ubc.debian.org/debian/
-  nameservers: ['206.12.19.214', '2607:f8f0:610:4000:224:81ff:fea7:e952', '206.12.19.20', '2607:f8f0:610:4000:218:feff:fe76:2ed0', '206.12.19.21', '2607:f8f0:610:4000:21c:c4ff:fee5:e890']
+  nameservers: ['206.12.19.212', '2607:f8f0:610:4000:6564:a62:ce0c:13d4', # ubc-bl2
+                '206.12.19.216', '2607:f8f0:610:4000:6564:a62:ce0c:13d8', # ubc-bl6
+                '206.12.19.218', '2607:f8f0:610:4000:224:81ff:fef8:7cb8'] # ubc-bl8
 ugent:
   netrange:
     - 157.193.0.0/16
@@ -169,6 +188,10 @@ ugent:
 umn:
   netrange:
     - 128.101.240.212
+unicamp:
+  netrange:
+    - 143.106.0.0/16
+  mirror-debian: http://debian.c3sl.ufpr.br/debian/
 utwente:
   netrange:
     - 130.89.0.0/16
@@ -185,6 +208,7 @@ ynic:
   netrange:
     - 144.32.168.64/28
   nameservers: [144.32.169.74, 144.32.169.75, 144.32.169.76]
+  mirror-debian: http://ftp.uk.debian.org/debian
 zivit:
   netrange:
     - 80.245.144.0/22