X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Fhoster.yaml;h=395f1f77abf1f308732553f4b65d3d3d8ab49c44;hb=552aed40f6b02e57e9bc6f560e84f767c535d3b4;hp=b1f11ffb005efb774f5e0cd6091ca1afbdbf56ab;hpb=c9eeba0351c99d335b8d2edb15f6c56a1290149f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index b1f11ffb0..395f1f77a 100644
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -17,7 +17,7 @@ accumu:
     - 130.236.0.0/14
     - 2001:06B0:000E::/48
   searchpaths: [debprivate-accumu.debian.org]
-  nameservers: [130.239.18.145, 130.239.1.90, 130.239.4.100]
+  nameservers: [130.239.18.251, 130.239.18.252, 130.239.1.90, 130.239.4.100]
 aql:
   netrange:
     - 141.170.6.144/28
@@ -38,7 +38,8 @@ brown:
     - 138.16.160.0/24
   # all hosts have their own recursor
   nameservers: []
-  mirror-debian: file:///srv/ftp-master.debian.org/mirror/ftp-master/
+  #mirror-debian: file:///srv/ftp-master.debian.org/mirror/ftp-master/
+  mirror-debian: http://ftp.us.debian.org/debian
 br:
   # rename to c3sl
   # University Federal do Parana (.br)
@@ -60,14 +61,15 @@ carnet:
 anu:
   netrange:
     - 150.203.164.0/24
-    - 2001:388:1034:2900::64
+    - 2001:388:1034:2900::/64
   nameservers: [150.203.1.10, 150.203.164.10, 150.203.164.9]
-  mirror-debian: http://mirror.linux.org.au/debian
+  #mirror-debian: http://mirror.linux.org.au/debian
+  #mirror-debian: http://ftp.au.debian.org/debian
 conova:
   netrange:
     - 217.196.149.224/28
-  nameservers: [217.196.144.129, 217.196.144.229]
-  mirror-debian: http://cdn-fastly.deb.debian.org/debian/
+  # nameservers: [217.196.144.129, 217.196.144.229]
+  mirror-debian: http://ftp.at.debian.org/debian/
 csail:
   netrange:
     - 128.31.0.0/24
@@ -80,11 +82,6 @@ dgi:
 freenet:
   netrange:
     - 62.104.0.0/16
-ftcollins:
-  netrange:
-    - 192.25.206.0/24
-  searchpaths: [debprivate-ftcollins.debian.org]
-  mirror-debian: http://spohr.debian.org/debian
 gatech:
   netrange:
     - 128.61.240.0/23
@@ -127,7 +124,7 @@ linaro:
     - 82.195.75.64/26
     - 2001:41b8:202:deb::/64
   searchpaths: [debprivate-darmstadt.debian.org]
-  #nameservers: [82.195.66.249, 217.198.242.225]
+  #nameservers: [82.195.77.77, 82.195.77.78]
   nameservers: [82.195.75.109, 82.195.75.103]
   #mirror-debian: http://debian.netcologne.de/debian/ [currently unstable]
   mirror-debian: http://ftp.de.debian.org/debian/
@@ -156,10 +153,6 @@ sanger:
   mirror-debian: http://mirror.bytemark.co.uk/debian/
   nameservers: [193.62.202.28, 193.62.202.29]
   searchpaths: [debprivate-sanger.debian.org]
-rapidswitch:
-  netrange:
-    - 193.201.200.0/23
-  nameservers: [87.117.198.200, 87.117.237.100, 87.117.196.200]
 scanplus:
   netrange:
     - 212.211.132.0/26
@@ -172,11 +165,20 @@ sil:
   searchpaths: [priv.sil.debian.org]
   nameservers: []
   mirror-debian: http://ftp.at.debian.org/debian/
+ubc:
+  netrange:
+    - 209.87.16.0/24
+    - 2607:F8F0:614:1::/64
+  searchpaths: [priv.ubc.debian.org, debprivate-ubc.debian.org]
+  mirror-debian: http://mirror-ubc.debian.org/debian/
+  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
 ubcece:
   netrange:
-    - 137.82.84.64/27
     - 206.12.19.0/24
-  searchpaths: [debprivate-ubc.debian.org]
+    - 2607:f8f0:610:4000::/64
+  searchpaths: [debprivate-ubc.debian.org, priv.ubc.debian.org]
   mirror-debian: http://mirror-ubc.debian.org/debian/
   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