X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Fhoster.yaml;h=9580873c844bfec3edb58e93c367338a5db97102;hb=1c3973826329522fc46ef9fc103ae58d8a4f5328;hp=575b5e94a0e12fdff455dad01dafb753a4d9d1c9;hpb=3a4fde5448956443511a1ce18ab4162a334eb30a;p=dsa-puppet.git

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index 575b5e94..9580873c 100644
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -2,9 +2,9 @@
 1und1:
   netrange:
     - 87.106.0.0/16
+    - 213.165.95.6/32
     - 2001:8d8:81:1520::/64
-  nameservers_break_dnssec: true
-  nameservers: [87.106.64.251, 195.20.224.99, 195.20.224.234]
+  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:
@@ -12,31 +12,21 @@
     - 212.227.126.32/27
     - 2001:8d8:2:1::/64
   searchpaths: [debprivate-oneandone.debian.org]
-  nameservers_break_dnssec: true
-  nameservers: [195.20.224.99, 195.20.224.234, 87.106.64.251]
 accumu:
   netrange:
     - 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]
-# Australian National University (ana.edu.au)
-ana:
+aql:
   netrange:
-    - 150.203.164.0/24
-    - 2001:388:1034:2900::64
-  nameservers_break_dnssec: true
-  nameservers: [150.203.1.10, 150.203.164.10, 150.203.164.9]
+    - 141.170.6.144/28
+  mirror-debian: http://ftp.uk.debian.org/debian/
 arm:
   netrange:
-    - 217.140.96.58/29
-  nameservers_break_dnssec: true
-  nameservers: [158.43.128.1, 217.140.108.113]
-br:
-  # University Federal do Parana (.br)
-  netrange:
-    - 200.17.192.0/19
-  nameservers: [200.236.31.1, 200.17.202.3]
+    - 217.140.96.0/22
+  entropy_provider_hoster: sil
+  mirror-debian: http://mirror.bytemark.co.uk/debian/
 brainfood:
   netrange:
     - 70.103.162.0/24
@@ -45,53 +35,68 @@ brainfood:
   nameservers: []
 brown:
   netrange:
-    - 128.148.0.0/16
+    - 138.16.160.0/24
   # all hosts have their own recursor
   nameservers: []
+  mirror-debian: file:///srv/ftp-master.debian.org/mirror/
+br:
+  # rename to c3sl
+  # University Federal do Parana (.br)
+  netrange:
+    - 200.17.192.0/19
+  nameservers: [200.236.31.1, 200.17.202.3]
+bytemark:
+  netrange:
+    - 5.153.231.0/24
+    - 89.16.160.112/29
+    - 2001:41c8:1000::/48
+    - 2001:41c8:61::/125
+  #searchpaths: [debprivate-bytemark.debian.org]
+  nameservers: [5.153.231.241, 5.153.231.242]
+  mirror-debian: http://mirror.bm.debian.org/debian
 carnet:
   netrange:
     - 193.198.0.0/16
-  nameservers_break_dnssec: true
-  nameservers: [161.53.160.3, 161.53.123.3]
+ana:
+  # rename to cecsit
+  netrange:
+    - 150.203.164.0/24
+    - 2001:388:1034:2900::64
+  nameservers: [150.203.1.10, 150.203.164.10, 150.203.164.9]
+conova:
+  netrange:
+    - 217.196.149.224/28
+  nameservers: [217.196.144.129, 217.196.144.229]
+  mirror-debian: http://debian.inode.at/debian/
 csail:
-  # mit
   netrange:
     - 128.31.0.0/24
   searchpaths: [debprivate-csail.debian.org]
   nameservers: [128.30.2.24, 128.30.2.25, 128.30.0.125]
-cst:
-  netrange:
-    - 213.188.99.208/28
-  nameservers: [213.157.0.194, 213.157.0.193]
-darmstadt:
-  netrange:
-    - 82.195.75.64/26
-    - 82.195.75.32/28
-    - 2001:41b8:202:deb::/64
-  searchpaths: [debprivate-darmstadt.debian.org]
-  nameservers: [82.195.66.249, 217.198.242.225]
+  mirror-debian: http://debian.csail.mit.edu/debian/
 dgi:
   netrange:
     - 93.94.130.128/26
-  nameservers: [195.49.152.215, 195.49.152.213, 195.49.152.214]
 freenet:
   netrange:
     - 62.104.0.0/16
-  nameservers_break_dnssec: true
-  nameservers: [194.97.3.83, 62.104.64.3, 194.97.3.11]
 ftcollins:
   netrange:
     - 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
+gatech:
+  netrange:
+    - 128.61.240.0/23
+  nameservers: [143.215.130.231 143.215.130.232]
+  mirror-debian: http://debian.gtisc.gatech.edu/debian/
 grnet:
   netrange:
     - 194.177.211.192/27
     - 2001:648:2ffc:deb::/64
   searchpaths: [debprivate-grnet.debian.org]
   nameservers: [194.177.210.10, 194.177.210.210]
+  mirror-debian: http://ftp.gr.debian.org/debian/
 helsinki:
   netrange:
     - 193.167.160.0/23
@@ -101,61 +106,81 @@ isc:
   netrange:
     - 149.20.0.0/16
     - 2001:4F8::/32
-  nameservers: [149.20.64.2, 204.152.184.67]
-nmmn:
+  #nameservers: [149.20.64.2, 204.152.184.67]
+  # sometimes very slow?
+  nameservers: []
+uni-karlsruhe:
+  # rename to karlsruhe
   netrange:
-    - 217.114.76.80/29
-  nameservers: [217.114.70.53, 217.114.77.53]
+    - 129.143.160.0/29
+    - 2001:7c0:400:1337::/64
+  nameservers: []
+  mirror-debian: http://ftp-stud.hs-esslingen.de/debian/
+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/
+'man-da':
+  netrange:
+    - 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.75.109, 82.195.75.103]
+  #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/
+marist:
+  netrange:
+    - 148.100.0.0/16
+  mirror-debian: http://ftp.us.debian.org/debian/
+  nameservers: []
 osuosl:
   netrange:
-    - 140.211.166.0/25
-    - 140.211.15.0/24
-  nameservers_break_dnssec: true
-  nameservers: [140.211.166.130, 140.211.166.131, 216.165.191.54]
+    - 140.211.0.0/16
+  mirror-debian: http://debian.osuosl.org/debian
+sakura:
+  netrange:
+    - 133.242.99.74/32
 sanger:
   netrange:
     - 193.62.202.24/29
   # broken with dnssec
   # nameservers: [193.62.203.96, 193.62.203.97]
   #resolvoptions: [single-request]
+  mirror-debian: http://mirror.bytemark.co.uk/debian/
   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
   nameservers: [87.117.198.200, 87.117.237.100, 87.117.196.200]
-sil:
-  netrange:
-    - 86.59.118.144/28
-  searchpaths: [debprivate-sil.debian.org]
-  #nameservers_break_dnssec: true
-  #nameservers: [213.129.232.1, 213.129.226.2]
-  nameservers: [86.59.118.147, 86.59.118.148]
-  allow_dns_query: [86.59.118.144/28 2001:858:2:2::/64]
 scanplus:
   netrange:
     - 212.211.132.0/26
     - 212.211.132.248/29
     - 2001:a78::/64
-  nameservers_break_dnssec: true
-  nameservers: [212.211.132.4, 212.75.32.4]
-snowman:
-  netrange:
-    - 72.66.115.54
-  nameservers: [10.10.1.1]
-telegrafxs4all:
+sil:
   netrange:
-    - 82.94.249.152/29
-  nameservers_break_dnssec: true
-  nameservers: [194.109.6.66]
+    - 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:
     - 137.82.84.64/27
     - 206.12.19.0/24
   searchpaths: [debprivate-ubc.debian.org]
-  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]
+  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
 ugent:
   netrange:
     - 157.193.0.0/16
@@ -163,8 +188,10 @@ ugent:
 umn:
   netrange:
     - 128.101.240.212
-  nameservers_break_dnssec: true
-  nameservers: [128.101.101.101, 134.84.84.84]
+unicamp:
+  netrange:
+    - 143.106.0.0/16
+  mirror-debian: http://debian.c3sl.ufpr.br/debian/
 utwente:
   netrange:
     - 130.89.0.0/16
@@ -173,6 +200,7 @@ utwente:
   #nameservers: [130.89.2.2, 130.89.2.3]
   nameservers: []
 xs4all:
+  # should be deleted
   netrange:
     - 194.109.137.216/29
     - 2001:888:2000:12::/64
@@ -180,12 +208,11 @@ ynic:
   netrange:
     - 144.32.168.64/28
   nameservers: [144.32.169.74, 144.32.169.75, 144.32.169.76]
+  mirror-debian: http://ftp.uk.debian.org/debian
 zivit:
   netrange:
     - 80.245.144.0/22
-  nameservers_break_dnssec: true
   nameservers: [80.245.147.53, 80.245.147.54]
+  mirror-debian: http://debian.netcologne.de/debian/
 
-# vim:set et:
-# vim:set sts=2 ts=2:
-# vim:set shiftwidth=2:
+# vim:set et sts=2 ts=2 sw=2: