Remove support for publishing DNS to bytemark

diff --git a/.gitignore b/.gitignore
index 1ef454d06df3df2117e96fb7841be9dcd33a4769..35e7a324fb15f158fb03b068c4b43141a14dd84e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 creds.json
 creds.json

-data/

 gdns/
 include/
 json/
 gdns/
 include/
 json/

diff --git a/Makefile b/Makefile
index e587a54ca69715ceeb87f9549cf15d061a5c8507..6b19a7d63416c212130fde359a2f19b63cdd4cd6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,9 @@
-preview: preview_bytemark preview_cloudflare
-
-preview_bytemark: data/openstreetmap.org data/openstreetmap.com data/openstreetmap.net \
-                 data/openstreetmap.ca data/openstreetmap.eu data/openstreetmap.pro \
-                 data/openstreetmaps.org data/osm.org data/openmaps.org \
-                 data/openstreetmap.io data/osm.io \
-                 data/openworldmap.org data/freeosm.org data/open-maps.org data/open-maps.com data/osmbugs.org \
-                 data/openstreetmap.uk data/openstreetmap.org.uk data/openstreetmap.co.uk \
-                 data/openstreetmap.org.za data/osm.org.za \
-                 data/osmfoundation.org \
-                 data/stateofthemap.org data/stateofthemap.com data/sotm.org \
-                 data/stateofthemap.eu \
-                 data/opengeodata.org \
-                 data/switch2osm.org data/switch2osm.com \
-                 data/tile.openstreetmap.org \
-                 data/render.openstreetmap.org \
-                 data/nominatim.openstreetmap.org
+preview: preview_cloudflare

 
 preview_cloudflare: include/sshfp.js include/tile.js include/render.js include/nominatim.js
        dnscontrol preview
 
 
 preview_cloudflare: include/sshfp.js include/tile.js include/render.js include/nominatim.js
        dnscontrol preview
 

-update: update_bytemark update_cloudflare update_geodns
-
-update_bytemark: preview_bytemark
-       bin/update
+update: update_cloudflare update_geodns

 
 update_cloudflare: include/sshfp.js include/tile.js include/render.js include/nominatim.js
        dnscontrol push --providers cloudflare
 
 update_cloudflare: include/sshfp.js include/tile.js include/render.js include/nominatim.js
        dnscontrol push --providers cloudflare


@@ -31,58 +12,25 @@ update_geodns: gdns/tile.map gdns/tile.resource gdns/tile.weighted gdns/nominati
        parallel --will-cite rsync --quiet --recursive --checksum gdns/ {}::geodns ::: ${GEODNS_SERVERS}
 
 clean:
        parallel --will-cite rsync --quiet --recursive --checksum gdns/ {}::geodns ::: ${GEODNS_SERVERS}
 
 clean:

-       rm -f data/* json/* origins/* gdns/*
+       rm -f includes/* json/* origins/* gdns/*

 
 lib/countries.xml:
        curl -s -o $@ http://api.geonames.org/countryInfo?username=demo
 
 
 lib/countries.xml:
        curl -s -o $@ http://api.geonames.org/countryInfo?username=demo
 

-data/openstreetmap.org: src/openstreetmap
-data/openstreetmap.com: src/openstreetmap
-data/openstreetmap.net: src/openstreetmap
-data/openstreetmap.ca: src/openstreetmap
-data/openstreetmap.eu: src/openstreetmap
-data/openstreetmap.pro: src/openstreetmap
-data/openstreetmaps.org: src/openstreetmap
-data/osm.org: src/openstreetmap
-data/openmaps.org: src/openstreetmap
-data/openstreetmap.io: src/openstreetmap
-data/osm.io: src/openstreetmap
-data/openworldmap.org: src/openstreetmap
-data/freeosm.org: src/openstreetmap
-data/open-maps.org: src/openstreetmap
-data/open-maps.com: src/openstreetmap
-data/osmbugs.org: src/openstreetmap
-data/openstreetmap.uk: src/openstreetmap-uk
-data/openstreetmap.org.uk: src/openstreetmap-uk
-data/openstreetmap.co.uk: src/openstreetmap-uk
-data/openstreetmap.org.za: src/openstreetmap-za
-data/osm.org.za: src/openstreetmap-za
-data/osmfoundation.org: src/osmfoundation
-data/stateofthemap.org: src/stateofthemap
-data/stateofthemap.com: src/stateofthemap
-data/sotm.org: src/stateofthemap
-data/opengeodata.org: src/opengeodata
-data/switch2osm.org: src/switch2osm
-data/switch2osm.com: src/switch2osm
-data/stateofthemap.eu: src/stateofthemap-eu
-

 include/sshfp.js: bin/mksshfp $(wildcard /etc/ssh/ssh_known_hosts)
        bin/mksshfp
 
 origins/tile.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/tile.openstreetmap.yml
        bin/mkcountries bandwidth/tile.openstreetmap.yml origins/tile.openstreetmap.yml
 
 include/sshfp.js: bin/mksshfp $(wildcard /etc/ssh/ssh_known_hosts)
        bin/mksshfp
 
 origins/tile.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/tile.openstreetmap.yml
        bin/mkcountries bandwidth/tile.openstreetmap.yml origins/tile.openstreetmap.yml
 

-data/tile.openstreetmap.org include/tile.js json/tile.openstreetmap.org.json origins/render.openstreetmap.yml gdns/tile.map gdns/tile.resource gdns/tile.weighted: bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap
-       bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap tile.openstreetmap.org tile origins/render.openstreetmap.yml tile
+include/tile.js json/tile.openstreetmap.org.json origins/render.openstreetmap.yml gdns/tile.map gdns/tile.resource gdns/tile.weighted: bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap
+       bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap tile origins/render.openstreetmap.yml tile

 
 

-data/render.openstreetmap.org include/render.js json/render.openstreetmap.org.json: bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap
-       bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap render.openstreetmap.org render origins/tile-total.openstreetmap.yml
+include/render.js json/render.openstreetmap.org.json: bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap
+       bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap render origins/tile-total.openstreetmap.yml

 
 origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/nominatim.openstreetmap.yml
        bin/mkcountries bandwidth/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml
 
 
 origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/nominatim.openstreetmap.yml
        bin/mkcountries bandwidth/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml
 

-data/nominatim.openstreetmap.org include/nominatim.js json/nominatim.openstreetmap.org.json origins/nominatim-total.openstreetmap.yml gdns/nominatim.map gdns/nominatim.resource gdns/nominatim.weighted: bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap
-       bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap nominatim.openstreetmap.org nominatim origins/nominatim-total.openstreetmap.yml nominatim
-
-data/%:
-       sed -r -e 's/$(notdir $<)(:|$$)/$(notdir $@)\1/g' < $< > $@
+include/nominatim.js json/nominatim.openstreetmap.org.json origins/nominatim-total.openstreetmap.yml gdns/nominatim.map gdns/nominatim.resource gdns/nominatim.weighted: bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap
+       bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap nominatim origins/nominatim-total.openstreetmap.yml nominatim

diff --git a/bin/mkgeo b/bin/mkgeo
index 77b44d9a3d1b790b266412c8c780e894d00f342f..400fff7cdc4dc24cde40c076f42086e2952fd8e7 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -14,7 +14,6 @@ use YAML;
 my $originfile = shift @ARGV;
 my $clusterfile = shift @ARGV;
 my $zone = shift @ARGV;
 my $originfile = shift @ARGV;
 my $clusterfile = shift @ARGV;
 my $zone = shift @ARGV;

-my $jszone = shift @ARGV;

 my $targetoriginfile = shift @ARGV;
 my $origins = YAML::LoadFile($originfile);
 my $clusters = YAML::LoadFile($clusterfile);
 my $targetoriginfile = shift @ARGV;
 my $origins = YAML::LoadFile($originfile);
 my $clusters = YAML::LoadFile($clusterfile);


@@ -205,12 +204,11 @@ while (grep { !exists($_->{cluster}) } values %$origins)
 my @json;
 
 # Open output files
 my @json;
 
 # Open output files

-my $zonefile = IO::File->new("> data/${zone}") || die "$!";
-my $jszonefile = IO::File->new("> include/${jszone}.js") || die "$!";
+my $zonefile = IO::File->new("> include/${zone}.js") || die "$!";

 my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
 
 # Output headers
 my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
 
 # Output headers

-$jszonefile->print("var \U${jszone}\E_RECORDS = [\n");
+$zonefile->print("var \U${zone}\E_RECORDS = [\n");

 
 # Output details for each country
 foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
 
 # Output details for each country
 foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)


@@ -232,10 +230,7 @@ foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
 
     if (!defined($gdnsname))
     {
 
     if (!defined($gdnsname))
     {

-        $zonefile->print("# $origin->{name}\n");
-        $zonefile->print("C\L$origin->{code}\E.${zone}:$cluster->{name}.${zone}:600\n");
-
-        $jszonefile->print("  CNAME(\"\L$origin->{code}\E.${jszone}\", \"$cluster->{name}.${zone}.\", TTL(\"10m\")),\n");
+        $zonefile->print("  CNAME(\"\L$origin->{code}\E.${zone}\", \"$cluster->{name}.${zone}.openstreetmap.org.\", TTL(\"10m\")),\n");

     }
 
     push @json, {
     }
 
     push @json, {


@@ -257,9 +252,6 @@ foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
 # Skip default records if we don't need them
 if (!defined($gdnsname))
 {
 # Skip default records if we don't need them
 if (!defined($gdnsname))
 {

-    # Header for default records
-    $zonefile->print("# Unknown origins\n");
-

     # Output default records for IPs that can't be mapped to a country
     foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
     {
     # Output default records for IPs that can't be mapped to a country
     foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
     {


@@ -267,28 +259,25 @@ if (!defined($gdnsname))
 
         if (my $default = $cluster->{default})
         {
 
         if (my $default = $cluster->{default})
         {

-            output_server($zonefile, $jszonefile, "${default}.${zone}", "${default}.${jszone}", $cluster);
+            output_server($zonefile, "${default}.${zone}", $cluster);

         }
         elsif (exists($cluster->{default}))
         {
         }
         elsif (exists($cluster->{default}))
         {

-            output_server($zonefile, $jszonefile, "${zone}", "${jszone}", $cluster);
+            output_server($zonefile, "${zone}", $cluster);

         }
     }
 }
 
         }
     }
 }
 

-# Header for underlying servers
-$zonefile->print("# Servers\n");
-

 # Output A records for each cluster
 foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 {
     my $name = $cluster->{name};
 
 # Output A records for each cluster
 foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 {
     my $name = $cluster->{name};
 

-    output_server($zonefile, $jszonefile, "${name}.${zone}", "${name}.${jszone}", $cluster);
+    output_server($zonefile, "${name}.${zone}", $cluster);

 
     if (@{$cluster->{servers}} > 1)
     {
 
     if (@{$cluster->{servers}} > 1)
     {

-        output_server($zonefile, $jszonefile, "${name}-%02d.${zone}", "${name}-%02d.${jszone}", $cluster);
+        output_server($zonefile, "${name}-%02d.${zone}", $cluster);

     }
 }
 
     }
 }
 


@@ -296,11 +285,10 @@ foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 $jsonfile->print(encode_json(\@json));
 
 # Output footers
 $jsonfile->print(encode_json(\@json));
 
 # Output footers

-$jszonefile->print("];\n");
+$zonefile->print("];\n");

 
 # Close the output files
 
 # Close the output files

-$jsonfile->close();
-$jszonefile->close();
+$zonefile->close();

 $zonefile->close();
 
 # Output gdnsd configuration
 $zonefile->close();
 
 # Output gdnsd configuration


@@ -535,17 +523,14 @@ sub compare_bandwidth
 sub output_server
 {
     my $zonefile = shift;
 sub output_server
 {
     my $zonefile = shift;

-    my $jszonefile = shift;

     my $name = shift;
     my $name = shift;

-    my $jsname = shift;

     my $cluster = shift;
 
     while (my($index,$server) = each @{$cluster->{servers}})
     {
         if ($server->{status} eq "up")
         {
     my $cluster = shift;
 
     while (my($index,$server) = each @{$cluster->{servers}})
     {
         if ($server->{status} eq "up")
         {

-            $zonefile->printf("+${name}:$server->{ipv4}:600\n", $index + 1);
-            $jszonefile->printf("  A(\"${jsname}\", \"$server->{ipv4}\", TTL(\"10m\")),\n", $index + 1);
+            $zonefile->printf("  A(\"${name}\", \"$server->{ipv4}\", TTL(\"10m\")),\n", $index + 1);

 
             if ($server->{ipv6})
             {
 
             if ($server->{ipv6})
             {


@@ -553,8 +538,7 @@ sub output_server
 
                 $ipv6 =~ s/([0-9a-f]{4})(?=.)/$1:/ig;
 
 
                 $ipv6 =~ s/([0-9a-f]{4})(?=.)/$1:/ig;
 

-                $zonefile->printf("3${name}:$server->{ipv6}:600\n", $index + 1);
-                $jszonefile->printf("  AAAA(\"${jsname}\", \"${ipv6}\", TTL(\"10m\")),\n", $index + 1);
+                $zonefile->printf("  AAAA(\"${name}\", \"${ipv6}\", TTL(\"10m\")),\n", $index + 1);

             }
         }
     }
             }
         }
     }

diff --git a/data/.gitkeep b/data/.gitkeep
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/opengeodata b/src/opengeodata
deleted file mode 100644 (file)
index 9969e8a..0000000
--- a/src/opengeodata
+++ /dev/null
@@ -1,19 +0,0 @@
-# tinydns data for opengeodata
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.opengeodata::a.ns.bytemark.co.uk
-.opengeodata::b.ns.bytemark.co.uk
-.opengeodata::c.ns.bytemark.co.uk
-
-# Publish a CAA record indicating that only letsencrypt should issue certificates
-
-:opengeodata:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
-
-# Main web server and it's aliases
-
-+opengeodata:193.60.236.19:600
-+old.opengeodata:193.60.236.19:600
-+www.opengeodata:193.60.236.19:600

diff --git a/src/openstreetmap b/src/openstreetmap
deleted file mode 100644 (file)
index 9f8f2fa..0000000
--- a/src/openstreetmap
+++ /dev/null
@@ -1,569 +0,0 @@
-# tinydns data for openstreetmap
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Set SOA values with reduced TTL for negative cache entries
-Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
-
-# Let Bytemark handle the DNS
-
-.openstreetmap::a.ns.bytemark.co.uk
-.openstreetmap::b.ns.bytemark.co.uk
-.openstreetmap::c.ns.bytemark.co.uk
-
-# Publish a CAA record indicating that only letsencrypt should issue certificates
-
-:openstreetmap:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
-
-# Make the virtual machine the primary MX
-
-@openstreetmap:212.110.172.32:a:10
-@noreply.openstreetmap::a.mx.openstreetmap:10
-@otrs.openstreetmap::a.mx.openstreetmap:10
-@messages.openstreetmap::a.mx.openstreetmap:10
-
-3a.mx.openstreetmap:200141c9000104000000000000000032
-
-# Publish an SPF record indicating that only shenron sends mail
-
-# https://anders.com/projects/sysadmin/djbdnsRecordBuilder/
-# v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx -all
-'openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040-all:86400
-'otrs.openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040-all:86400
-
-# Announce MTA-STS policy and TLSRPT policy for error reports
-
-'_mta-sts.openstreetmap:v=STSv1;\040id=202001291805Z
-'_smtp._tls.openstreetmap:v=TLSRPTv1;\040rua=mailto\072postmaster@openstreetmap.org
-
-# Delegate MTA-STS policy for subdomains
-
-C_mta-sts.noreply.openstreetmap:_mta-sts.openstreetmap
-C_mta-sts.otrs.openstreetmap:_mta-sts.openstreetmap
-C_mta-sts.messages.openstreetmap:_mta-sts.openstreetmap
-
-# Google postmaster tools verification
-
-Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
-'openstreetmap:google-site-verification=oMMclkNxMVPPk0lhThg5S7cuzUZmtL_OZWTCrAwNcqQ
-
-# Delegate geo.openstreetmap.org to PowerDNS
-
-# saphira.openstreetmap.org
-&geo.openstreetmap:185.73.44.30:a.ns.openstreetmap
-# ridgeback.openstreetmap.org
-&geo.openstreetmap:31.169.50.10:b.ns.openstreetmap
-# jakelong.openstreetmap.org
-&geo.openstreetmap:71.19.155.177:c.ns.openstreetmap
-# katie.openstreetmap.org
-&geo.openstreetmap:144.76.70.77:d.ns.openstreetmap
-# stormfly-02.openstreetmap.org
-&geo.openstreetmap:140.211.167.105:e.ns.openstreetmap
-# chrysophylax.openstreetmap.org
-&geo.openstreetmap:217.71.244.22:f.ns.openstreetmap
-
-# Main web servers and their aliases
-
-+spike-01.openstreetmap:130.117.76.6
-3spike-01.openstreetmap:200109780002002c0000000001720006
-#+openstreetmap:130.117.76.6:600
-#3openstreetmap:200109780002002c0000000001720006:600
-#+www.openstreetmap:130.117.76.6:600
-#3www.openstreetmap:200109780002002c0000000001720006:600
-#+api.openstreetmap:130.117.76.6:600
-#3api.openstreetmap:200109780002002c0000000001720006:600
-#+maps.openstreetmap:130.117.76.6:600
-#3maps.openstreetmap:200109780002002c0000000001720006:600
-#+mapz.openstreetmap:130.117.76.6:600
-#3mapz.openstreetmap:200109780002002c0000000001720006:600
-+spike-01.ams.openstreetmap:10.0.48.6
-+spike-01.oob.openstreetmap:10.0.49.6
-
-+spike-02.openstreetmap:130.117.76.7
-3spike-02.openstreetmap:200109780002002c0000000001720007
-#+openstreetmap:130.117.76.7:600
-#3openstreetmap:200109780002002c0000000001720007:600
-#+www.openstreetmap:130.117.76.7:600
-#3www.openstreetmap:200109780002002c0000000001720007:600
-#+api.openstreetmap:130.117.76.7:600
-#3api.openstreetmap:200109780002002c0000000001720007:600
-#+maps.openstreetmap:130.117.76.7:600
-#3maps.openstreetmap:200109780002002c0000000001720007:600
-#+mapz.openstreetmap:130.117.76.7:600
-#3mapz.openstreetmap:200109780002002c0000000001720007:600
-+spike-02.ams.openstreetmap:10.0.48.7
-+spike-02.oob.openstreetmap:10.0.49.7
-
-+spike-03.openstreetmap:130.117.76.8
-3spike-03.openstreetmap:200109780002002c0000000001720008
-#+openstreetmap:130.117.76.8:600
-#3openstreetmap:200109780002002c0000000001720008:600
-#+www.openstreetmap:130.117.76.8:600
-#3www.openstreetmap:200109780002002c0000000001720008:600
-#+api.openstreetmap:130.117.76.8:600
-#3api.openstreetmap:200109780002002c0000000001720008:600
-#+maps.openstreetmap:130.117.76.8:600
-#3maps.openstreetmap:200109780002002c0000000001720008:600
-#+mapz.openstreetmap:130.117.76.8:600
-#3mapz.openstreetmap:200109780002002c0000000001720008:600
-+spike-03.ams.openstreetmap:10.0.48.8
-+spike-03.oob.openstreetmap:10.0.49.8
-
-+spike-04.openstreetmap:89.16.162.21
-3spike-04.openstreetmap:200141c9000200d60000000000000021
-#+openstreetmap:89.16.162.21:600
-#3openstreetmap:200141c9000200d60000000000000021:600
-#+www.openstreetmap:89.16.162.21:600
-#3www.openstreetmap:200141c9000200d60000000000000021:600
-#+api.openstreetmap:89.16.162.21:600
-#3api.openstreetmap:200141c9000200d60000000000000021:600
-#+maps.openstreetmap:89.16.162.21:600
-#3maps.openstreetmap:200141c9000200d60000000000000021:600
-#+mapz.openstreetmap:89.16.162.21:600
-#3mapz.openstreetmap:200141c9000200d60000000000000021:600
-+spike-04.bm.openstreetmap:10.0.32.21
-+spike-04.oob.openstreetmap:10.0.33.21
-
-+spike-05.openstreetmap:89.16.162.22
-3spike-05.openstreetmap:200141c9000200d60000000000000022
-#+openstreetmap:89.16.162.22:600
-#3openstreetmap:200141c9000200d60000000000000022:600
-#+www.openstreetmap:89.16.162.22:600
-#3www.openstreetmap:200141c9000200d60000000000000022:600
-#+api.openstreetmap:89.16.162.22:600
-#3api.openstreetmap:200141c9000200d60000000000000022:600
-#+maps.openstreetmap:89.16.162.22:600
-#3maps.openstreetmap:200141c9000200d60000000000000022:600
-#+mapz.openstreetmap:89.16.162.22:600
-#3mapz.openstreetmap:200141c9000200d60000000000000022:600
-+spike-05.bm.openstreetmap:10.0.32.22
-+spike-05.oob.openstreetmap:10.0.33.22
-
-+spike-06.openstreetmap:130.117.76.11
-3spike-06.openstreetmap:200109780002002c000000000172000B
-+openstreetmap:130.117.76.11:600
-3openstreetmap:200109780002002c000000000172000B:600
-+www.openstreetmap:130.117.76.11:600
-3www.openstreetmap:200109780002002c000000000172000B:600
-+api.openstreetmap:130.117.76.11:600
-3api.openstreetmap:200109780002002c000000000172000B:600
-+maps.openstreetmap:130.117.76.11:600
-3maps.openstreetmap:200109780002002c000000000172000B:600
-+mapz.openstreetmap:130.117.76.11:600
-3mapz.openstreetmap:200109780002002c000000000172000B:600
-+spike-06.ams.openstreetmap:10.0.48.11
-+spike-06.oob.openstreetmap:10.0.49.11
-
-+spike-07.openstreetmap:130.117.76.12
-3spike-07.openstreetmap:200109780002002c000000000172000C
-+openstreetmap:130.117.76.12:600
-3openstreetmap:200109780002002c000000000172000C:600
-+www.openstreetmap:130.117.76.12:600
-3www.openstreetmap:200109780002002c000000000172000C:600
-+api.openstreetmap:130.117.76.12:600
-3api.openstreetmap:200109780002002c000000000172000C:600
-+maps.openstreetmap:130.117.76.12:600
-3maps.openstreetmap:200109780002002c000000000172000C:600
-+mapz.openstreetmap:130.117.76.12:600
-3mapz.openstreetmap:200109780002002c000000000172000C:600
-+spike-07.ams.openstreetmap:10.0.48.12
-+spike-07.oob.openstreetmap:10.0.49.12
-
-+spike-08.openstreetmap:130.117.76.13
-3spike-08.openstreetmap:200109780002002c000000000172000D
-+openstreetmap:130.117.76.13:600
-3openstreetmap:200109780002002c000000000172000D:600
-+www.openstreetmap:130.117.76.13:600
-3www.openstreetmap:200109780002002c000000000172000D:600
-+api.openstreetmap:130.117.76.13:600
-3api.openstreetmap:200109780002002c000000000172000D:600
-+maps.openstreetmap:130.117.76.13:600
-3maps.openstreetmap:200109780002002c000000000172000D:600
-+mapz.openstreetmap:130.117.76.13:600
-3mapz.openstreetmap:200109780002002c000000000172000D:600
-+spike-08.ams.openstreetmap:10.0.48.13
-+spike-08.oob.openstreetmap:10.0.49.13
-
-# Rails application servers
-
-+thorn-01.ams.openstreetmap:10.0.48.51
-+rails1.ams.openstreetmap:10.0.48.51
-+thorn-01.oob.openstreetmap:10.0.49.51
-
-+thorn-02.ams.openstreetmap:10.0.48.52
-+rails2.ams.openstreetmap:10.0.48.52
-+thorn-02.oob.openstreetmap:10.0.49.52
-
-+thorn-03.ams.openstreetmap:10.0.48.53
-+rails3.ams.openstreetmap:10.0.48.53
-+thorn-03.oob.openstreetmap:10.0.49.53
-
-+thorn-04.bm.openstreetmap:10.0.32.41
-+rails4.bm.openstreetmap:10.0.32.41
-+thorn-04.oob.openstreetmap:10.0.33.41
-
-+thorn-05.bm.openstreetmap:10.0.32.42
-+rails5.bm.openstreetmap:10.0.32.42
-+thorn-05.oob.openstreetmap:10.0.33.42
-
-# Nominatim servers
-
-+pummelzacken.openstreetmap:193.60.236.18
-#+nominatim.openstreetmap:193.60.236.18:600
-+pummelzacken.ucl.openstreetmap:10.0.0.20
-+pummelzacken.oob.openstreetmap:10.0.1.20
-
-+dulcy.openstreetmap:130.117.76.9
-3dulcy.openstreetmap:200109780002002c0000000001720009
-+nominatim.openstreetmap:130.117.76.9:600
-3nominatim.openstreetmap:200109780002002c0000000001720009:600
-+dulcy.ams.openstreetmap:10.0.48.9
-+dulcy.oob.openstreetmap:10.0.49.9
-
-# Taginfo server
-
-+grindtooth.openstreetmap:193.60.236.15
-+taginfo.openstreetmap:193.60.236.15:600
-+grindtooth.ucl.openstreetmap:10.0.0.19
-+grindtooth.oob.openstreetmap:10.0.1.19
-
-+stormfly-01.openstreetmap:140.211.167.104
-6stormfly-01.openstreetmap:2605bc8030100700000000008cdea768
-#+taginfo.openstreetmap:140.211.167.104:600
-#3taginfo.openstreetmap:2605bc8030100700000000008cdea768:600
-+stormfly-01.oob.openstreetmap:10.0.0.99
-
-# Mapnik tile server, with wildcard alias to allow parallel loading
-
-+orm.openstreetmap:130.117.76.3
-3orm.openstreetmap:200109780002002c0000000001720003
-+orm.ams.openstreetmap:10.0.48.3
-+orm.oob.openstreetmap:10.0.49.3
-
-+odin.openstreetmap:130.117.76.15
-3odin.openstreetmap:200109780002002c000000000172000F
-+odin.ams.openstreetmap:10.0.48.15
-+odin.oob.openstreetmap:10.0.49.15
-
-+ysera.openstreetmap:193.60.236.22
-+ysera.ucl.openstreetmap:10.0.0.15
-+ysera.oob.openstreetmap:10.0.1.15
-
-+scorch.openstreetmap:176.31.235.79
-3scorch.openstreetmap:200141d00002fc4f0000000000000001
-
-+rhaegal.openstreetmap:161.53.248.77:600
-
-+pyrene.openstreetmap:140.211.167.98
-3pyrene.openstreetmap:2605bc8030100700000000008cd3a762
-+pyrene.oob.openstreetmap:10.0.0.40
-
-+bowser.openstreetmap:138.44.68.106
-
-Ctile.openstreetmap:tile.geo.openstreetmap.org
-Ca.tile.openstreetmap:tile.geo.openstreetmap.org
-Cb.tile.openstreetmap:tile.geo.openstreetmap.org
-Cc.tile.openstreetmap:tile.geo.openstreetmap.org
-
-# Services machine
-
-+ironbelly.openstreetmap:130.117.76.10
-3ironbelly.openstreetmap:200109780002002c000000000172000a
-+backup.openstreetmap:130.117.76.10:600
-3backup.openstreetmap:200109780002002c000000000172000a:600
-+planet.openstreetmap:130.117.76.10:600
-3planet.openstreetmap:200109780002002c000000000172000a:600
-+logstash.openstreetmap:130.117.76.10
-3logstash.openstreetmap:200109780002002c000000000172000a
-+ironbelly.ams.openstreetmap:10.0.48.10
-+ironbelly.oob.openstreetmap:10.0.49.10
-
-+grisu.openstreetmap:89.16.162.20
-3grisu.openstreetmap:200141c9000200d60000000000000020
-#+backup.openstreetmap:89.16.162.20:600
-#3backup.openstreetmap:200141c9000200d60000000000000020:600
-#+planet.openstreetmap:89.16.162.20:600
-#3planet.openstreetmap:200141c9000200d60000000000000020:600
-+grisu.bm.openstreetmap:10.0.32.20
-+grisu.oob.openstreetmap:10.0.33.20
-
-# Database servers
-
-+karm.ams.openstreetmap:10.0.48.50
-+karm.oob.openstreetmap:10.0.49.50
-
-+eddie.ucl.openstreetmap:10.0.0.10
-+eddie.oob.openstreetmap:10.0.1.10
-
-+katla.bm.openstreetmap:10.0.32.40
-+katla.oob.openstreetmap:10.0.33.40
-
-+ramoth.ams.openstreetmap:10.0.48.5
-+ramoth.oob.openstreetmap:10.0.49.5
-
-# Development server with wildcard alias for user sites
-
-+errol.openstreetmap:193.60.236.13
-+dev.openstreetmap:193.60.236.13
-+*.dev.openstreetmap:193.60.236.13
-+ooc.openstreetmap:193.60.236.13
-+a.ooc.openstreetmap:193.60.236.13
-+b.ooc.openstreetmap:193.60.236.13
-+c.ooc.openstreetmap:193.60.236.13
-+npe.openstreetmap:193.60.236.13
-+errol.ucl.openstreetmap:10.0.0.14
-+errol.oob.openstreetmap:10.0.1.14
-
-# Foundation server
-
-+ridley.openstreetmap:193.60.236.19
-+otrs.openstreetmap:193.60.236.19
-+blog.openstreetmap:193.60.236.19
-+foundation.openstreetmap:193.60.236.19
-+hot.openstreetmap:193.60.236.19
-+dmca.openstreetmap:193.60.236.19
-+ridley.ucl.openstreetmap:10.0.0.3
-+ridley.oob.openstreetmap:10.0.1.3
-
-# Piwik server
-
-+eustace.openstreetmap:193.60.236.14
-+piwik.openstreetmap:193.60.236.14
-+eustace.ucl.openstreetmap:10.0.0.9
-+eustace.oob.openstreetmap:10.0.1.9
-
-# Imagery servers
-
-+draco.openstreetmap:193.60.236.12
-+draco.ucl.openstreetmap:10.0.0.11
-+draco.oob.openstreetmap:10.0.1.11
-
-+kessie.openstreetmap:178.250.74.36
-3kessie.openstreetmap:2a02165800040000dad385fffe5d875e
-+agri.openstreetmap:178.250.74.36:3600
-3agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-+a.agri.openstreetmap:178.250.74.36:3600
-3a.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-+b.agri.openstreetmap:178.250.74.36:3600
-3b.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-+c.agri.openstreetmap:178.250.74.36:3600
-3c.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-+os.openstreetmap:178.250.74.36:3600
-3os.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-+a.os.openstreetmap:178.250.74.36:3600
-3a.os.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-+b.os.openstreetmap:178.250.74.36:3600
-3b.os.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-+c.os.openstreetmap:178.250.74.36:3600
-3c.os.openstreetmap:2a02165800040000dad385fffe5d875e:3600
-+kessie.oob.openstreetmap:178.250.74.37
-
-# Munin server
-
-+urmel.openstreetmap:193.60.236.21
-+munin.openstreetmap:193.60.236.21
-+urmel.ucl.openstreetmap:10.0.0.6
-+urmel.oob.openstreetmap:10.0.1.6
-
-# Chef server
-
-+sarel.openstreetmap:193.60.236.20
-+chef.openstreetmap:193.60.236.20
-+hardware.openstreetmap:193.60.236.20
-+acme.openstreetmap:193.60.236.20
-+git.openstreetmap:193.60.236.20:600
-+dns.openstreetmap:193.60.236.20:600
-+sarel.ucl.openstreetmap:10.0.0.12
-+sarel.oob.openstreetmap:10.0.1.12
-
-# Forum server
-
-+clifford.openstreetmap:193.60.236.11
-+forum.openstreetmap:193.60.236.11:600
-+clifford.ucl.openstreetmap:10.0.0.17
-+clifford.oob.openstreetmap:10.0.1.17
-
-# KVMs
-
-+kvm1.ucl.openstreetmap:10.0.0.21
-
-# Managed network switches
-
-+switch1.openstreetmap:130.117.76.2
-3switch1.openstreetmap:200109780002002c0000000001720002
-
-# Managed power strips
-
-+pdu1.ams.openstreetmap:10.0.48.100
-+pdu2.ams.openstreetmap:10.0.48.101
-
-# Bytemark machine, and the services which operate from it
-
-+shenron.openstreetmap:212.110.172.32
-+mail.openstreetmap:212.110.172.32
-+mta-sts.openstreetmap:212.110.172.32
-+lists.openstreetmap:212.110.172.32
-+svn.openstreetmap:212.110.172.32
-+trac.openstreetmap:212.110.172.32
-+irc.openstreetmap:212.110.172.32
-+help.openstreetmap:212.110.172.32
-+blogs.openstreetmap:212.110.172.32:600
-+shenron.bm.openstreetmap:10.0.16.3
-
-3shenron.openstreetmap:200141c9000104000000000000000032
-3mail.openstreetmap:200141c9000104000000000000000032
-3lists.openstreetmap:200141c9000104000000000000000032
-3svn.openstreetmap:200141c9000104000000000000000032
-3trac.openstreetmap:200141c9000104000000000000000032
-3help.openstreetmap:200141c9000104000000000000000032
-3blogs.openstreetmap:200141c9000104000000000000000032:600
-
-# Wiki servers
-
-+ouroboros.openstreetmap:130.117.76.4
-3ouroboros.openstreetmap:200109780002002c0000000001720004
-#+wiki.openstreetmap:130.117.76.4:600
-#3wiki.openstreetmap:200109780002002c0000000001720004:600
-+ouroboros.ams.openstreetmap:10.0.48.4
-+ouroboros.oob.openstreetmap:10.0.49.4
-
-+tabaluga.openstreetmap:130.117.76.14
-3tabaluga.openstreetmap:200109780002002c000000000172000E
-+wiki.openstreetmap:130.117.76.14:600
-3wiki.openstreetmap:200109780002002c000000000172000E:600
-+tabaluga.ams.openstreetmap:10.0.48.14
-+tabaluga.oob.openstreetmap:10.0.49.14
-
-# GPS tile server
-
-+noquiklos.openstreetmap:193.60.236.16
-+gps-tile.openstreetmap:193.60.236.16
-+a.gps-tile.openstreetmap:193.60.236.16
-+b.gps-tile.openstreetmap:193.60.236.16
-+c.gps-tile.openstreetmap:193.60.236.16
-+gps.tile.openstreetmap:193.60.236.16
-+gps-a.tile.openstreetmap:193.60.236.16
-+gps-b.tile.openstreetmap:193.60.236.16
-+gps-c.tile.openstreetmap:193.60.236.16
-+noquiklos.ucl.openstreetmap:10.0.0.13
-+noquiklos.oob.openstreetmap:10.0.1.13
-
-# Tile cache servers
-
-+gorynych.openstreetmap:5.45.248.21
-3gorynych.openstreetmap:2a0206b8b0105065000000000000a001
-+trogdor.openstreetmap:134.90.146.26
-+trogdor.oob.openstreetmap:134.90.146.30
-+ridgeback.openstreetmap:31.169.50.10
-+ridgeback.oob.openstreetmap:31.169.50.14
-+jakelong.openstreetmap:71.19.155.177:600
-3jakelong.openstreetmap:2605270000000017a80000fffe3ecdca:600
-+nepomuk.openstreetmap:77.95.65.39
-3nepomuk.openstreetmap:2a039180000001000000000000000007
-+simurgh.openstreetmap:94.20.20.55
-+katie.openstreetmap:144.76.70.77
-3katie.openstreetmap:2a0104f80191834c0000000000000002
-+konqi.openstreetmap:81.7.11.83
-3konqi.openstreetmap:2a020180000100010000000005170b53
-+longma.openstreetmap:140.110.240.7
-3longma.openstreetmap:20010e10200002400000000000000007
-+viserion.openstreetmap:193.198.233.211
-3viserion.openstreetmap:20010b684cff00030000000000000003
-+drogon.openstreetmap:161.53.30.107
-3drogon.openstreetmap:20010b68c0ff000002215efffe40c7c4
-+saphira.openstreetmap:185.73.44.30
-3saphira.openstreetmap:20010ba800002c1e0000000000000000
-+toothless.openstreetmap:185.73.44.167
-3toothless.openstreetmap:20010ba800002ca70000000000000000
-+sarkany.openstreetmap:37.17.173.8
-3sarkany.openstreetmap:20014c480002bf04025056fffe8f5c81
-+cmok.openstreetmap:31.130.201.40
-3cmok.openstreetmap:2001067c22681005021e8cfffe8c8d3b
-+stormfly-02.openstreetmap:140.211.167.105
-6stormfly-02.openstreetmap:2605bc8030100700000000008cdea769
-+stormfly-02.oob.openstreetmap:10.0.0.108
-+rimfaxe.openstreetmap:130.225.254.109
-3rimfaxe.openstreetmap:20010878034600000000000000000109
-+culebre.openstreetmap:155.210.4.103
-+kalessin.openstreetmap:185.66.195.245
-3kalessin.openstreetmap:2a032260200000010000000000000005
-+angor.openstreetmap:196.10.54.165
-#3angor.openstreetmap:200143f801f40b00b283fefffed8dd45
-+ladon.openstreetmap:83.212.2.116
-3ladon.openstreetmap:200106482ffe00040000000000000116
-+ascalon.openstreetmap:184.107.48.228
-+noomoahk.openstreetmap:91.224.148.166
-3noomoahk.openstreetmap:2a0372208080a6000000000000000001
-+cherufe.openstreetmap:200.91.44.37
-+norbert.openstreetmap:89.234.186.100
-3norbert.openstreetmap:2a005884821c00000000000000000001
-+chrysophylax.openstreetmap:217.71.244.22
-3chrysophylax.openstreetmap:200108e0004020390000000000000010
-+necrosan.openstreetmap:80.67.167.77
-3necrosan.openstreetmap:2a0bcbc0110d0001000000000000001c
-+keizer.openstreetmap:195.201.226.63
-3keizer.openstreetmap:2a0104f81c1cbc540000000000000001
-+vipertooth.openstreetmap:176.122.99.101
-3vipertooth.openstreetmap:2001067c2d4000000000000000000065
-+tuatara.openstreetmap:114.23.141.203
-3tuatara.openstreetmap:24061e00b4100c24529a4cfffe79bc3b
-+waima.openstreetmap:103.197.61.160
-+nidhogg.openstreetmap:130.236.254.221
-3nidhogg.openstreetmap:200106b00017f0a000000000000000dd
-+boitata.openstreetmap:200.236.31.207
-3boitata.openstreetmap:2801008280ff80020216ccfffeaa0021
-+fafnir.openstreetmap:130.239.18.114
-3fafnir.openstreetmap:200106b0000e2a180000000000000114
-+fume.openstreetmap:147.228.60.16
-+balerion.openstreetmap:138.44.68.134
-+naga.openstreetmap:185.116.130.151
-
-# Blades
-
-+tiamat-00.openstreetmap:193.60.236.40
-+tiamat-00.ucl.openstreetmap:10.0.0.40
-+tiamat-00.oob.openstreetmap:10.0.1.40
-+tiamat-01.openstreetmap:193.60.236.41
-+tiamat-01.ucl.openstreetmap:10.0.0.41
-+tiamat-01.oob.openstreetmap:10.0.1.41
-+tiamat-02.openstreetmap:193.60.236.42
-+tiamat-02.ucl.openstreetmap:10.0.0.42
-+tiamat-02.oob.openstreetmap:10.0.1.42
-+tiamat-03.openstreetmap:193.60.236.43
-+tiamat-03.ucl.openstreetmap:10.0.0.43
-+tiamat-03.oob.openstreetmap:10.0.1.43
-+tiamat-10.openstreetmap:193.60.236.44
-+tiamat-10.ucl.openstreetmap:10.0.0.44
-+tiamat-10.oob.openstreetmap:10.0.1.44
-+tiamat-11.openstreetmap:193.60.236.45
-+tiamat-11.ucl.openstreetmap:10.0.0.45
-+tiamat-11.oob.openstreetmap:10.0.1.45
-+tiamat-12.openstreetmap:193.60.236.46
-+tiamat-12.ucl.openstreetmap:10.0.0.46
-+tiamat-12.oob.openstreetmap:10.0.1.46
-+tiamat-13.openstreetmap:193.60.236.47
-+tiamat-13.ucl.openstreetmap:10.0.0.47
-+tiamat-13.oob.openstreetmap:10.0.1.47
-+tiamat-20.openstreetmap:193.60.236.48
-+tiamat-20.ucl.openstreetmap:10.0.0.48
-+tiamat-20.oob.openstreetmap:10.0.1.48
-+tiamat-21.openstreetmap:193.60.236.49
-+tiamat-21.ucl.openstreetmap:10.0.0.49
-+tiamat-21.oob.openstreetmap:10.0.1.49
-+tiamat-22.openstreetmap:193.60.236.50
-+tiamat-22.ucl.openstreetmap:10.0.0.50
-+tiamat-22.oob.openstreetmap:10.0.1.50
-+tiamat-23.openstreetmap:193.60.236.51
-+tiamat-23.ucl.openstreetmap:10.0.0.51
-+tiamat-23.oob.openstreetmap:10.0.1.51
-
-# Donation site
-
-+donate.openstreetmap:193.60.236.19:300
-
-# Uptime site at StatusCake
-
-Cuptime.openstreetmap:uptimessl.statuscake.com
-
-# Custom Domain for https://github.com/osmfoundation/welcome-mat/
-Cwelcome.openstreetmap:osmfoundation.github.io

diff --git a/src/openstreetmap-uk b/src/openstreetmap-uk
deleted file mode 100644 (file)
index 2727c5c..0000000
--- a/src/openstreetmap-uk
+++ /dev/null
@@ -1,74 +0,0 @@
-# tinydns data for openstreetmap.[org|co].uk
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.openstreetmap-uk::a.ns.bytemark.co.uk
-.openstreetmap-uk::b.ns.bytemark.co.uk
-.openstreetmap-uk::c.ns.bytemark.co.uk
-
-# Publish a CAA record indicating that only letsencrypt should issue certificates
-
-:openstreetmap-uk:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
-
-# Make the virtual machine the primary MX with Bytemark as backup
-
-@openstreetmap-uk::a.mx.openstreetmap.org:10
-
-# Publish an SPF record indicating that only shenron sends mail
-
-'openstreetmap-uk:v=spf1 include\072openstreetmap.org -all
-
-# Delegate MTA-STS policy
-
-C_mta-sts.openstreetmap-uk:_mta-sts.openstreetmap.org
-
-# Main web servers and their aliases
-
-+openstreetmap-uk:193.63.75.99:600
-+openstreetmap-uk:193.63.75.100:600
-+openstreetmap-uk:193.63.75.103:600
-
-Cwww.openstreetmap-uk:www.openstreetmap.org
-Capi.openstreetmap-uk:api.openstreetmap.org
-
-# Andy Street calendar instance
-Ccalendar.openstreetmap-uk:osmcal.street.me.uk
-
-# Shaun McDonald taginfo instance
-Ctaginfo.openstreetmap-uk:proxy.mythic-beasts.com
-
-# Aerial imagery sites
-+hampshire.aerial.openstreetmap-uk:178.250.74.36:3600
-3hampshire.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+a.hampshire.aerial.openstreetmap-uk:178.250.74.36:3600
-3a.hampshire.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+b.hampshire.aerial.openstreetmap-uk:178.250.74.36:3600
-3b.hampshire.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+c.hampshire.aerial.openstreetmap-uk:178.250.74.36:3600
-3c.hampshire.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+surrey.aerial.openstreetmap-uk:178.250.74.36:3600
-3surrey.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+a.surrey.aerial.openstreetmap-uk:178.250.74.36:3600
-3a.surrey.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+b.surrey.aerial.openstreetmap-uk:178.250.74.36:3600
-3b.surrey.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+c.surrey.aerial.openstreetmap-uk:178.250.74.36:3600
-3c.surrey.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+os.openstreetmap-uk:178.250.74.36:3600
-3os.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+a.os.openstreetmap-uk:178.250.74.36:3600
-3a.os.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+b.os.openstreetmap-uk:178.250.74.36:3600
-3b.os.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+c.os.openstreetmap-uk:178.250.74.36:3600
-3c.os.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+ea.openstreetmap-uk:178.250.74.36:3600
-3ea.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+a.ea.openstreetmap-uk:178.250.74.36:3600
-3a.ea.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+b.ea.openstreetmap-uk:178.250.74.36:3600
-3b.ea.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
-+c.ea.openstreetmap-uk:178.250.74.36:3600
-3c.ea.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600

diff --git a/src/openstreetmap-za b/src/openstreetmap-za
deleted file mode 100644 (file)
index 252ad9e..0000000
--- a/src/openstreetmap-za
+++ /dev/null
@@ -1,67 +0,0 @@
-# tinydns data for [openstreetmap|org].org.za
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.openstreetmap-za::a.ns.bytemark.co.uk
-.openstreetmap-za::b.ns.bytemark.co.uk
-.openstreetmap-za::c.ns.bytemark.co.uk
-
-# Publish a CAA record indicating that only letsencrypt should issue certificates
-
-:openstreetmap-za:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
-
-# Make the virtual machine the primary MX with Bytemark as backup
-
-@openstreetmap-za::a.mx.openstreetmap.org:10
-
-# Publish an SPF record indicating that only shenron sends mail
-
-'openstreetmap-za:v=spf1 include\072openstreetmap.org -all
-
-# Main web servers and their aliases
-
-+openstreetmap-za:193.63.75.99:600
-+openstreetmap-za:193.63.75.100:600
-+openstreetmap-za:193.63.75.103:600
-
-Cwww.openstreetmap-za:www.openstreetmap.org
-Capi.openstreetmap-za:api.openstreetmap.org
-
-Cwww.openstreetmap-za:openstreetmap-za
-
-# Aerial imagery sites
-
-# Draco
-+aerial.openstreetmap-za:193.60.236.12:600
-+a.aerial.openstreetmap-za:193.60.236.12:600
-+b.aerial.openstreetmap-za:193.60.236.12:600
-+c.aerial.openstreetmap-za:193.60.236.12:600
-
-# Kessie
-+coct.aerial.openstreetmap-za:178.250.74.36:1800
-3coct.aerial.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+a.coct.aerial.openstreetmap-za:178.250.74.36:1800
-3a.coct.aerial.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+b.coct.aerial.openstreetmap-za:178.250.74.36:1800
-3b.coct.aerial.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+c.coct.aerial.openstreetmap-za:178.250.74.36:1800
-3c.coct.aerial.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+topo.openstreetmap-za:178.250.74.36:1800
-3topo.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+a.topo.openstreetmap-za:178.250.74.36:1800
-3a.topo.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+b.topo.openstreetmap-za:178.250.74.36:1800
-3b.topo.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+c.topo.openstreetmap-za:178.250.74.36:1800
-3c.topo.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-
-+namibia-topo.openstreetmap-za:178.250.74.36:1800
-3namibia-topo.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+a.namibia-topo.openstreetmap-za:178.250.74.36:1800
-3a.namibia-topo.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+b.namibia-topo.openstreetmap-za:178.250.74.36:1800
-3b.namibia-topo.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800
-+c.namibia-topo.openstreetmap-za:178.250.74.36:1800
-3c.namibia-topo.openstreetmap-za:2a02165800040000dad385fffe5d875e:1800

diff --git a/src/osmfoundation b/src/osmfoundation
deleted file mode 100644 (file)
index 7eaca4c..0000000
--- a/src/osmfoundation
+++ /dev/null
@@ -1,65 +0,0 @@
-# tinydns data for osmfoundation
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.osmfoundation::a.ns.bytemark.co.uk
-.osmfoundation::b.ns.bytemark.co.uk
-.osmfoundation::c.ns.bytemark.co.uk
-
-# Publish a CAA record indicating that only letsencrypt should issue certificates
-
-:osmfoundation:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
-
-# SPF Record
-# https://anders.com/projects/sysadmin/djbdnsRecordBuilder/
-# v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 a mx include:_spf.google.com -all
-'osmfoundation:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040a\040mx\040include\072_spf.google.com\040-all:86400
-
-# Let google handle email
-
-@osmfoundation::aspmx.l.google.com:1:3600
-@osmfoundation::alt1.aspmx.l.google.com:5:3600
-@osmfoundation::alt2.aspmx.l.google.com:5:3600
-@osmfoundation::alt3.aspmx.l.google.com:10:3600
-@osmfoundation::alt4.aspmx.l.google.com:10:3600
-
-# Handle mail for the join subdomain ourselves
-
-@join.osmfoundation::a.mx.openstreetmap.org:10
-
-# Add DKIM public key
-# Use : raw to workaround TXT split issue
-
-:google._domainkey.osmfoundation:16:\352v=DKIM1;\040k=rsa;\040p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJmTBAkYRCocCCNtVsdRNMlQel8kNfjPYJpjEm7woEgZh9yZeDzxImtz+u73oUF4+7bXzrNYbP946WNQIwAba1J69he8L1qfPBJLd3Z\057fgmuaGdWcxpDno2EY4cQ8PrzvI6Vfm+6YAFANl8w09CIg41ykdlzH4iUJXD35k3SIl3wIDAQAB:900
-
-# Add XMPP chat servers for compatibility
-
-:_xmpp-server._tcp.osmfoundation:33:\000\005\000\000\024\225\013xmpp-server\001l\006google\003com\000
-:_xmpp-server._tcp.osmfoundation:33:\000\024\000\000\024\225\014xmpp-server1\001l\006google\003com\000
-:_xmpp-server._tcp.osmfoundation:33:\000\024\000\000\024\225\014xmpp-server2\001l\006google\003com\000
-:_xmpp-server._tcp.osmfoundation:33:\000\024\000\000\024\225\014xmpp-server3\001l\006google\003com\000
-:_xmpp-server._tcp.osmfoundation:33:\000\024\000\000\024\225\014xmpp-server4\001l\006google\003com\000
-
-# Aliases for google services
-
-Clogin.osmfoundation:ghs.google.com
-Cdocs.osmfoundation:ghs.google.com
-Cmail.osmfoundation:ghs.google.com
-Ccalendar.osmfoundation:ghs.google.com
-Csites.osmfoundation:ghs.google.com
-
-# Main web server and it's aliases
-
-+osmfoundation:193.60.236.19:600
-+old.osmfoundation:193.60.236.19:600
-+www.osmfoundation:193.60.236.19:600
-+wiki.osmfoundation:193.60.236.19:600
-+blog.osmfoundation:193.60.236.19:600
-+crm.osmfoundation:193.60.236.19:600
-+join.osmfoundation:193.60.236.19:600
-+board.osmfoundation:193.60.236.19:600
-+dwg.osmfoundation:193.60.236.19:600
-+mwg.osmfoundation:193.60.236.19:600
-+operations.osmfoundation:193.60.236.19:600

diff --git a/src/stateofthemap b/src/stateofthemap
deleted file mode 100644 (file)
index dc4f5ef..0000000
--- a/src/stateofthemap
+++ /dev/null
@@ -1,43 +0,0 @@
-# tinydns data for stateofthemap
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.stateofthemap::a.ns.bytemark.co.uk
-.stateofthemap::b.ns.bytemark.co.uk
-.stateofthemap::c.ns.bytemark.co.uk
-
-# Publish a CAA record indicating that only letsencrypt should issue certificates
-
-:stateofthemap:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
-
-# Let google handle email
-
-@stateofthemap::aspmx.l.google.com:1:3600
-@stateofthemap::alt1.aspmx.l.google.com:5:3600
-@stateofthemap::alt2.aspmx.l.google.com:5:3600
-@stateofthemap::aspmx2.googlemail.com:10:3600
-@stateofthemap::aspmx3.googlemail.com:10:3600
-
-# Alias for login
-
-Clogin.stateofthemap:ghs.google.com
-
-# Main web server and it's aliases
-
-+stateofthemap:193.60.236.19:600
-+www.stateofthemap:193.60.236.19:600
-+2020.stateofthemap:193.60.236.19:600
-+2019.stateofthemap:193.60.236.19:600
-+2018.stateofthemap:193.60.236.19:600
-+2017.stateofthemap:193.60.236.19:600
-+2016.stateofthemap:193.60.236.19:600
-+2014.stateofthemap:188.226.171.99
-+2013.stateofthemap:193.60.236.19:600
-+2012.stateofthemap:193.60.236.19:600
-+2011.stateofthemap:193.60.236.19:600
-+2010.stateofthemap:193.60.236.19:600
-+2009.stateofthemap:193.60.236.19:600
-+2008.stateofthemap:193.60.236.19:600
-+2007.stateofthemap:193.60.236.19:600

diff --git a/src/stateofthemap-eu b/src/stateofthemap-eu
deleted file mode 100644 (file)
index 8bdf20d..0000000
--- a/src/stateofthemap-eu
+++ /dev/null
@@ -1,22 +0,0 @@
-# tinydns data for stateofthemap-eu
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.stateofthemap-eu::a.ns.bytemark.co.uk
-.stateofthemap-eu::b.ns.bytemark.co.uk
-.stateofthemap-eu::c.ns.bytemark.co.uk
-
-# Publish a CAA record indicating that only letsencrypt should issue certificates
-
-:stateofthemap-eu:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
-
-# Let openstreetmap.at handle email for the moment
-
-@stateofthemap-eu::openstreetmap.at:1:3600
-
-# Main web server and it's aliases
-
-+stateofthemap-eu:88.198.206.107:600
-+www.stateofthemap-eu:88.198.206.107:600

diff --git a/src/switch2osm b/src/switch2osm
deleted file mode 100644 (file)
index 3195e79..0000000
--- a/src/switch2osm
+++ /dev/null
@@ -1,18 +0,0 @@
-# tinydns data for switch2osm
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.switch2osm::a.ns.bytemark.co.uk
-.switch2osm::b.ns.bytemark.co.uk
-.switch2osm::c.ns.bytemark.co.uk
-
-# Publish a CAA record indicating that only letsencrypt should issue certificates
-
-:switch2osm:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
-
-# Main web server and it's aliases
-
-+switch2osm:193.60.236.19:600
-+www.switch2osm:193.60.236.19:600