X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Ffiles%2Fmisc%2Fhoster.yaml;h=06d0e164ba452cc92248d4d1704e07f36e3eb29c;hb=a6dc2ce398a9c49a4d5ddf131aefbe53d247f4d3;hp=81f1d3da7d13cbd2ca8f9b33b581fd79bd6e7850;hpb=24dcba3cb522f3c3a08b35de0233d1b89bc40d41;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/files/misc/hoster.yaml b/modules/debian_org/files/misc/hoster.yaml
index 81f1d3da7..06d0e164b 100644
--- a/modules/debian_org/files/misc/hoster.yaml
+++ b/modules/debian_org/files/misc/hoster.yaml
@@ -10,50 +10,49 @@ 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: http://ftp.uk.debian.org/debian/
+  mirror-debian: https://mirror.bytemark.co.uk/debian/
 arm:
   netrange:
     - 217.140.96.0/22
   entropy_provider_hoster: sil
-  mirror-debian: http://ftp.uk.debian.org/debian/
-brown:
-  netrange:
-    - 138.16.160.0/24
-  # all hosts have their own recursor
-  #mirror-debian: file:///srv/ftp-master.debian.org/mirror/ftp-master/
-  mirror-debian: http://ftp.us.debian.org/debian
+  mirror-debian: https://mirror.bytemark.co.uk/debian/
 br:
   # rename to c3sl
   # University Federal do Parana (.br)
   netrange:
     - 200.17.192.0/19
+brown:
+  netrange:
+    - 138.16.160.0/24
+  # all hosts have their own recursor
+  mirror-debian: https://mirrors.wikimedia.org/debian
 bytemark:
   netrange:
     - 5.153.231.0/24
     - 89.16.160.112/29
     - 2001:41c8:1000::/48
     - 2001:41c8:61::/125
-  mirror-debian: http://mirror.bm.debian.org/debian
+  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
-  #mirror-debian: http://mirror.linux.org.au/debian
-  #mirror-debian: http://ftp.au.debian.org/debian
 conova:
   netrange:
     - 217.196.149.224/28
-  mirror-debian: http://mirror.netcologne.de/debian/
+    - 185.69.161.160/29
+  mirror-debian: https://mirror.netcologne.de/debian/
 csail:
   netrange:
     - 128.31.0.0/24
-  mirror-debian: http://debian.csail.mit.edu/debian/
+    - 2603:400a:ffff:bb8::/64
+  mirror-debian: https://mirrors.wikimedia.org/debian
 dgi:
   netrange:
     - 93.94.130.128/26
@@ -63,12 +62,11 @@ freenet:
 gatech:
   netrange:
     - 128.61.240.0/23
-  mirror-debian: http://debian.gtisc.gatech.edu/debian/
+  mirror-debian: https://mirrors.wikimedia.org/debian
 grnet:
   netrange:
     - 194.177.211.192/27
     - 2001:648:2ffc:deb::/64
-  mirror-debian: http://ftp.gr.debian.org/debian/
 helsinki:
   netrange:
     - 193.167.160.0/23
@@ -77,36 +75,28 @@ isc:
   netrange:
     - 149.20.0.0/16
     - 2001:4F8::/32
-uni-karlsruhe:
-  # rename to karlsruhe
+leaseweb:
   netrange:
-    - 129.143.160.0/29
-    - 2001:7c0:400:1337::/64
-  mirror-debian: http://ftp-stud.hs-esslingen.de/debian/
+    - 185.17.185.176/28
 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/
+  mirror-debian: https://mirrors.wikimedia.org/debian
 'man-da':
   netrange:
     - 82.195.75.64/26
     - 2001:41b8:202:deb::/64
-  #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/
+  mirror-debian: https://mirror.netcologne.de/debian/
 marist:
   netrange:
     - 148.100.0.0/16
-  mirror-debian: http://ftp.us.debian.org/debian/
+  mirror-debian: https://mirrors.wikimedia.org/debian
 osuosl:
   netrange:
     - 140.211.0.0/16
-  mirror-debian: http://debian.osuosl.org/debian
+  mirror-debian: https://mirrors.wikimedia.org/debian
 sakura:
   netrange:
     - 133.242.99.74/32
@@ -114,7 +104,7 @@ sanger:
   netrange:
     - 193.62.202.24/29
   #resolvoptions: [single-request]
-  mirror-debian: http://mirror.bytemark.co.uk/debian/
+  mirror-debian: https://mirror.bytemark.co.uk/debian/
 scanplus:
   netrange:
     - 212.211.132.0/26
@@ -124,11 +114,9 @@ sil:
   netrange:
     - 86.59.118.144/28
     - 2001:858:2:2::/64
-  mirror-debian: http://ftp.at.debian.org/debian/
 skroutz:
   netrange:
     - 154.57.0.248/29
-  mirror-debian: http://ftp.debian.org/debian
 ubc:
   netrange:
     - 209.87.16.0/24
@@ -136,17 +124,22 @@ ubc:
     # old range:
     - 206.12.19.0/24
     - 2607:f8f0:610:4000::/64
-  mirror-debian: http://mirror-ubc.debian.org/debian/
+  mirror-debian: https://mirrors.wikimedia.org/debian
 ugent:
   netrange:
     - 157.193.0.0/16
 umn:
   netrange:
     - 128.101.240.212
+uni-karlsruhe:
+  # rename to karlsruhe
+  netrange:
+    - 129.143.160.0/29
+    - 2001:7c0:400:1337::/64
+  mirror-debian: https://mirror.netcologne.de/debian/
 unicamp:
   netrange:
     - 143.106.167.112/28
-  mirror-debian: http://ftp.br.debian.org/debian/
 utwente:
   netrange:
     - 130.89.0.0/16
@@ -160,10 +153,10 @@ xs4all:
 ynic:
   netrange:
     - 144.32.168.64/28
-  mirror-debian: http://ftp.uk.debian.org/debian
+  mirror-debian: https://mirror.bytemark.co.uk/debian/
 zivit:
   netrange:
     - 80.245.144.0/22
-  mirror-debian: http://debian.netcologne.de/debian/
+  mirror-debian: https://mirror.netcologne.de/debian/
 
 # vim:set et sts=2 ts=2 sw=2: