X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Fhoster.yaml;h=63fa2b1678b71ab2518b3cef601ece284e8a8f1e;hb=683ffc212c9c3a4d7e4a4ff98c94fb52a75a02ca;hp=d2d718798f755cecb1ecb264611ad86d42fe9ff1;hpb=b518528cc88fe0e09b678670de9134fa524c030b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index d2d718798..63fa2b167 100644
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -3,6 +3,7 @@
   netrange:
     - 87.106.0.0/16
     - 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
 1und1-sec:
   netrange:
@@ -28,7 +29,7 @@ brainfood:
   nameservers: []
 brown:
   netrange:
-    - 128.148.0.0/16
+    - 138.16.160.0/24
   # all hosts have their own recursor
   nameservers: []
 br:
@@ -45,8 +46,7 @@ bytemark:
     - 2001:41c8:61::/125
   #searchpaths: [debprivate-bytemark.debian.org]
   nameservers: [5.153.231.241, 5.153.231.242]
-  allow_dns_query: [5.153.231.0/24]
-  mirror-debian: http://mirror.bytemark.co.uk/debian
+  mirror-debian: http://mirror.bm.debian.org/debian
 carnet:
   netrange:
     - 193.198.0.0/16
@@ -78,8 +78,7 @@ ftcollins:
     - 192.25.206.0/24
   searchpaths: [debprivate-ftcollins.debian.org]
   nameservers: [192.25.206.33, 192.25.206.57]
-  # only applicable for hosts that are recursive anyway:
-  allow_dns_query: [192.25.206.0/24]
+  mirror-debian: http://spohr.debian.org/debian
 grnet:
   netrange:
     - 194.177.211.192/27
@@ -104,6 +103,7 @@ uni-karlsruhe:
     - 129.143.160.0/29
     - 2001:7c0:400:1337::/64
   nameservers: []
+  mirror-debian: http://ftp-stud.hs-esslingen.de/debian/
 'man-da':
   netrange:
     - 82.195.75.64/26
@@ -119,6 +119,7 @@ osuosl:
   netrange:
     - 140.211.166.0/25
     - 140.211.15.0/24
+  mirror-debian: http://debian.osuosl.org/debian
 sanger:
   netrange:
     - 193.62.202.24/29
@@ -127,7 +128,6 @@ sanger:
   #resolvoptions: [single-request]
   nameservers: [193.62.202.28, 193.62.202.29]
   searchpaths: [debprivate-sanger.debian.org]
-  allow_dns_query: [193.62.202.24/29]
 rapidswitch:
   netrange:
     - 193.201.200.0/23
@@ -141,9 +141,8 @@ sil:
   netrange:
     - 86.59.118.144/28
     - 2001:858:2:2::/64
-  searchpaths: [debprivate-sil.debian.org]
-  nameservers: [86.59.118.147, 86.59.118.148]
-  allow_dns_query: [86.59.118.144/28, 2001:858:2:2::/64]
+  searchpaths: [priv.sil.debian.org]
+  nameservers: []
   mirror-debian: http://ftp.at.debian.org/debian/
 ubcece:
   netrange:
@@ -151,8 +150,7 @@ 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]
-  allow_dns_query: [137.82.84.64/27, 206.12.19.0/24, 2607:f8f0:610:4000::/64]
+  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']
 ugent:
   netrange:
     - 157.193.0.0/16