X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Fhoster.yaml;h=49752c070e26960eb8851d8153d43ff65ac0371b;hb=103e56b48752f77fd66edd1824d82946570ca033;hp=3c2a73b11144ace9d0ec73f9eb2f9a217f70b112;hpb=f663f54583fe6542d5928cfce3ad29cd3672da3b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index 3c2a73b11..49752c070 100644
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -20,24 +20,12 @@ accumu:
     - 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:
-  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]
 arm:
   netrange:
     - 217.140.96.0/22
   nameservers_break_dnssec: true
   nameservers: [158.43.128.1, 217.140.108.113]
   entropy_provider_hoster: sil
-br:
-  # University Federal do Parana (.br)
-  netrange:
-    - 200.17.192.0/19
-  nameservers: [200.236.31.1, 200.17.202.3]
 brainfood:
   netrange:
     - 70.103.162.0/24
@@ -49,17 +37,29 @@ brown:
     - 128.148.0.0/16
   # all hosts have their own recursor
   nameservers: []
-conova:
+br:
+  # rename to c3sl
+  # University Federal do Parana (.br)
   netrange:
-    - 217.196.149.224/28
-  nameservers: [217.196.144.129, 217.196.144.229]
+    - 200.17.192.0/19
+  nameservers: [200.236.31.1, 200.17.202.3]
 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_break_dnssec: true
+  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]
 csail:
-  # mit
   netrange:
     - 128.31.0.0/24
   searchpaths: [debprivate-csail.debian.org]
@@ -98,6 +98,12 @@ isc:
   #nameservers: [149.20.64.2, 204.152.184.67]
   # sometimes very slow?
   nameservers: []
+uni-karlsruhe:
+  # rename to karlsruhe
+  netrange:
+    - 129.143.160.0/29
+    - 2001:7c0:400:1337::/64
+  nameservers: []
 'man-da':
   netrange:
     - 82.195.75.64/26
@@ -105,7 +111,10 @@ isc:
     - 2001:41b8:202:deb::/64
   searchpaths: [debprivate-darmstadt.debian.org]
   nameservers: [82.195.66.249, 217.198.242.225]
-  longname: Metropolitan Area Network Darmstadt [man-da]
+marist:
+  netrange:
+    - 148.100.96.0/25
+  nameservers: []
 osuosl:
   netrange:
     - 140.211.166.0/25
@@ -125,6 +134,13 @@ rapidswitch:
   netrange:
     - 193.201.200.0/23
   nameservers: [87.117.198.200, 87.117.237.100, 87.117.196.200]
+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]
 sil:
   netrange:
     - 86.59.118.144/28
@@ -134,13 +150,6 @@ sil:
   #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]
 ubcece:
   netrange:
     - 137.82.84.64/27
@@ -148,12 +157,6 @@ ubcece:
   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]
-uni-karlsruhe:
-  longname: Karlsruhe Institute of Technology [uni-karlsruhe]
-  netrange:
-    - 129.143.160.0/29
-    - 2001:7c0:400:1337::/64
-  nameservers: []
 ugent:
   netrange:
     - 157.193.0.0/16
@@ -171,6 +174,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
@@ -179,12 +183,9 @@ ynic:
     - 144.32.168.64/28
   nameservers: [144.32.169.74, 144.32.169.75, 144.32.169.76]
 zivit:
-  longname: Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]
   netrange:
     - 80.245.144.0/22
   nameservers_break_dnssec: true
   nameservers: [80.245.147.53, 80.245.147.54]
 
-# vim:set et:
-# vim:set sts=2 ts=2:
-# vim:set shiftwidth=2:
+# vim:set et sts=2 ts=2 sw=2: