Make sibelius and smetana nameservers at sanger

[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 16fe48a..2e46936 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -11,11 +11,12 @@
     - 2001:8d8:2:1::/64
   searchpaths: [debprivate-oneandone.debian.org]
   nameservers: [195.20.224.99, 195.20.224.234, 87.106.64.251]
-aacumea:
+accumu:
   netrange:
     - 130.236.0.0/14
     - 2001:06B0:000E::/48
-  nameservers: [130.239.18.145, 130.239.1.90, 130.239.4.100]·
+  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:
   netrange:
@@ -34,11 +35,15 @@ br:
 brainfood:
   netrange:
     - 70.103.162.0/24
+  searchpaths: [debprivate-brainfood.debian.org]
   nameservers: [70.103.162.29, 70.103.162.4]
+  # master accepts queries from murphy
+  allow_dns_query: [70.103.162.31/32]
 brown:
   netrange:
     - 128.148.0.0/16
-  nameservers: [128.148.34.103, 128.148.34.3]
+  # all hosts have their own recursor
+  nameservers: []
 carnet:
   netrange:
     - 193.198.0.0/16
@@ -47,6 +52,7 @@ 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:
@@ -70,8 +76,10 @@ freenet:
 ftcollins:
   netrange:
     - 192.25.206.0/24
-  searchpaths: [debprivate-debprivate-ftcollins.debian.org]
+  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]
 grnet:
   netrange:
     - 194.177.211.192/27
@@ -99,8 +107,12 @@ osuosl:
 sanger:
   netrange:
     - 193.62.202.24/29
-  nameservers: [193.62.203.96, 193.62.203.97]
-  resolvoptions: [single-request]
+  # broken with dnssec
+  # nameservers: [193.62.203.96, 193.62.203.97]
+  #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
@@ -108,6 +120,7 @@ rapidswitch:
 sil:
   netrange:
     - 86.59.118.144/28
+  searchpaths: [debprivate-sil.debian.org]
   nameservers: [213.129.232.1, 213.129.226.2]
 scanplus:
   netrange:
@@ -129,6 +142,7 @@ ubcece:
     - 206.12.19.0/24
   searchpaths: [debprivate-ubc.debian.org]
   nameservers: [206.12.19.5, 137.82.1.1, 142.103.1.1]
+  allow_dns_query: [137.82.84.64/27, 206.12.19.0/24]
 ugent:
   netrange:
     - 157.193.0.0/16
@@ -141,7 +155,9 @@ utwente:
   netrange:
     - 130.89.0.0/16
     - 2001:0610:1908::/48
-  nameservers: [130.89.2.2, 130.89.2.3]
+  # broken with dnssec
+  #nameservers: [130.89.2.2, 130.89.2.3]
+  nameservers: []
 xs4all:
   netrange:
     - 194.109.137.216/29