X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Fhoster.yaml;h=ec1e045ee750a88dd22e6e1cfbc51880b6b1aaca;hb=0f26db93a578d938406cb506d868eda43a791149;hp=ea60b9d7b9fcd969de1f397f94a9936c8706f089;hpb=4e64ca83ecbc1775b768b273518dc49f0dfa2c42;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index ea60b9d7b..ec1e045ee 100644
--- 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
@@ -128,7 +129,8 @@ linaro:
   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
 leaseweb:
   netrange:
     - 185.17.185.176/28
@@ -140,8 +142,7 @@ marist:
   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:
@@ -152,7 +153,7 @@ sanger:
   # broken with dnssec
   # nameservers: [193.62.203.96, 193.62.203.97]
   #resolvoptions: [single-request]
-  mirror-debian: http://mirror.bytemark.co.uk/debian/
+  mirror-debian: http://ukdebian.mirror.anlx.net/debian/
   nameservers: [193.62.202.28, 193.62.202.29]
   searchpaths: [debprivate-sanger.debian.org]
 rapidswitch:
@@ -177,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', '5.153.231.248', '2001:41c8:1000:20::20:248', '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
@@ -205,7 +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://mirror.ynic.york.ac.uk/debian
+  mirror-debian: http://ftp.uk.debian.org/debian
 zivit:
   netrange:
     - 80.245.144.0/22