Remove support for publishing DNS to bytemark

[dns.git] / bin / mkgeo

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 $jszone = shift @ARGV;
 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 $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
-$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)
@@ -232,10 +230,7 @@ foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
 
     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, {
@@ -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))
 {
-    # 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)
     {
@@ -267,28 +259,25 @@ if (!defined($gdnsname))
 
         if (my $default = $cluster->{default})
         {
-            output_server($zonefile, $jszonefile, "${default}.${zone}", "${default}.${jszone}", $cluster);
+            output_server($zonefile, "${default}.${zone}", $cluster);
         }
         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_server($zonefile, $jszonefile, "${name}.${zone}", "${name}.${jszone}", $cluster);
+    output_server($zonefile, "${name}.${zone}", $cluster);
 
     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
-$jszonefile->print("];\n");
+$zonefile->print("];\n");
 
 # Close the output files
-$jsonfile->close();
-$jszonefile->close();
+$zonefile->close();
 $zonefile->close();
 
 # Output gdnsd configuration
@@ -535,17 +523,14 @@ sub compare_bandwidth
 sub output_server
 {
     my $zonefile = shift;
-    my $jszonefile = shift;
     my $name = shift;
-    my $jsname = shift;
     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})
             {
@@ -553,8 +538,7 @@ sub output_server
 
                 $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);
             }
         }
     }