X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Fhoster.yaml;h=9079e8572c99d8bcc614427f754fa17a4db8acdd;hb=0197bda3eea9ddc92775251f6ab75ae86f1923fc;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..9079e8572 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
@@ -37,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/
+  #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)
@@ -56,17 +58,17 @@ bytemark:
 carnet:
   netrange:
     - 193.198.0.0/16
-ana:
-  # rename to cecsit
+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
 conova:
   netrange:
     - 217.196.149.224/28
-  nameservers: [217.196.144.129, 217.196.144.229]
-  mirror-debian: http://debian.inode.at/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
@@ -79,11 +81,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
@@ -126,13 +123,14 @@ 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/
+  #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: http://mirror.nl.leaseweb.net/debian/
 marist:
   netrange:
     - 148.100.0.0/16
@@ -140,8 +138,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:
@@ -177,7 +174,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
@@ -187,8 +186,8 @@ umn:
     - 128.101.240.212
 unicamp:
   netrange:
-    - 143.106.0.0/16
-  mirror-debian: http://debian.c3sl.ufpr.br/debian/
+    - 177.220.0.0/17
+  mirror-debian: http://ftp.br.debian.org/debian/
 utwente:
   netrange:
     - 130.89.0.0/16
@@ -205,7 +204,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