fix munin 1

[mirror/dsa-puppet.git] / modules / debian-org / misc / hoster.yaml

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index c4e59ed..7917dda 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -4,119 +4,160 @@
     - 195.20.242.64/26
     - 212.227.126.32/27
     - 2001:8d8:2:1::/64
-1und1:
-  netrange:
-    - 87.106.0.0/16
-    - 2001:8d8:81:1520::/64
-aacumea:
+accumu:
   netrange:
     - 130.236.0.0/14
     - 2001:06B0:000E::/48
-# Australian National University (ana.edu.au)
-ana:
+aql:
   netrange:
-    - 150.203.164.0/24
-    - 2001:388:1034:2900::64
+    - 141.170.6.144/28
+  mirror-debian: http://ftp.uk.debian.org/debian/
 arm:
   netrange:
-    - 217.140.96.58/29
+    - 217.140.96.0/22
+  entropy_provider_hoster: sil
+  mirror-debian: http://mirror.bytemark.co.uk/debian/
+brown:
+  netrange:
+    - 138.16.160.0/24
+  # all hosts have their own recursor
+  #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)
   netrange:
     - 200.17.192.0/19
-brainfood:
+bytemark:
   netrange:
-    - 70.103.162.0/24
-brown:
-  netrange:
-    - 128.148.0.0/16
+    - 5.153.231.0/24
+    - 89.16.160.112/29
+    - 2001:41c8:1000::/48
+    - 2001:41c8:61::/125
+  mirror-debian: http://mirror.bm.debian.org/debian
 carnet:
   netrange:
     - 193.198.0.0/16
-csail:
+anu:
   netrange:
-    - 128.31.0.0/24
-cst:
+    - 150.203.164.0/24
+    - 2001:388:1034:2900::/64
+  #mirror-debian: http://mirror.linux.org.au/debian
+  #mirror-debian: http://ftp.au.debian.org/debian
+conova:
   netrange:
-    - 213.188.99.208/28
-darmstadt:
+    - 217.196.149.224/28
+  mirror-debian: http://mirror.netcologne.de/debian/
+csail:
   netrange:
-    - 82.195.75.64/26
-    - 82.195.75.32/28
-    - 2001:41b8:202:deb::/64
+    - 128.31.0.0/24
+  mirror-debian: http://debian.csail.mit.edu/debian/
 dgi:
   netrange:
     - 93.94.130.128/26
 freenet:
   netrange:
     - 62.104.0.0/16
-ftcollins:
+gatech:
   netrange:
-    - 192.25.206.0/24
+    - 128.61.240.0/23
+  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
+  # all hosts have their own recursor
 isc:
   netrange:
     - 149.20.0.0/16
     - 2001:4F8::/32
-nmmn:
+uni-karlsruhe:
+  # rename to karlsruhe
+  netrange:
+    - 129.143.160.0/29
+    - 2001:7c0:400:1337::/64
+  mirror-debian: http://ftp-stud.hs-esslingen.de/debian/
+linaro:
   netrange:
-    - 217.114.76.80/29
+    - 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
+  #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/
 osuosl:
   netrange:
-    - 140.211.166.0/25
-    - 140.211.15.0/24
-  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
-rapidswitch:
-  netrange:
-    - 193.201.200.0/23
-sil:
-  netrange:
-    - 86.59.118.144/28
+  #resolvoptions: [single-request]
+  mirror-debian: http://mirror.bytemark.co.uk/debian/
 scanplus:
   netrange:
     - 212.211.132.0/26
     - 212.211.132.248/29
     - 2001:a78::/64
-snowman:
-  netrange:
-    - 72.66.115.54
-telegrafxs4all:
+sil:
   netrange:
-    - 82.94.249.152/29
-ubcece:
+    - 86.59.118.144/28
+    - 2001:858:2:2::/64
+  mirror-debian: http://ftp.at.debian.org/debian/
+ubc:
   netrange:
-    - 137.82.84.64/27
+    - 209.87.16.0/24
+    - 2607:F8F0:614:1::/64
+    # old range:
     - 206.12.19.0/24
-  searchpaths: [debprivate-ubc.debian.org]
-  nameservers: [206.12.19.5, 137.82.1.1, 142.103.1.1]
+    - 2607:f8f0:610:4000::/64
+  mirror-debian: http://mirror-ubc.debian.org/debian/
 ugent:
   netrange:
     - 157.193.0.0/16
 umn:
   netrange:
     - 128.101.240.212
+unicamp:
+  netrange:
+    - 177.220.0.0/17
+  mirror-debian: http://ftp.br.debian.org/debian/
 utwente:
   netrange:
     - 130.89.0.0/16
     - 2001:0610:1908::/48
+  # broken with dnssec
 xs4all:
+  # should be deleted
   netrange:
     - 194.109.137.216/29
     - 2001:888:2000:12::/64
 ynic:
   netrange:
     - 144.32.168.64/28
+  mirror-debian: http://ftp.uk.debian.org/debian
 zivit:
   netrange:
     - 80.245.144.0/22
+  mirror-debian: http://debian.netcologne.de/debian/
+
+# vim:set et sts=2 ts=2 sw=2: