Fix generation of JSON data for tile server map

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index 873fbf830d834ab89527b9476045fc9afff922b0..77b44d9a3d1b790b266412c8c780e894d00f342f 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+use v5.12;
+
 use strict;
 use warnings;
 
@@ -12,6 +14,7 @@ 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);
@@ -203,8 +206,12 @@ my @json;
 
 # Open output files
 my $zonefile = IO::File->new("> data/${zone}") || die "$!";
+my $jszonefile = IO::File->new("> include/${jszone}.js") || die "$!";
 my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
 
+# Output headers
+$jszonefile->print("var \U${jszone}\E_RECORDS = [\n");
+
 # Output details for each country
 foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
 {
@@ -223,8 +230,13 @@ foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
         $clon = $clon + 360;
     }
 
-    $zonefile->print("# $origin->{name}\n");
-    $zonefile->print("C\L$origin->{code}\E.${zone}:$cluster->{name}.${zone}:600\n");
+    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");
+    }
 
     push @json, {
         type => "Feature",
@@ -242,21 +254,25 @@ foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
     $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth};
 }
 
-# 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)
+# Skip default records if we don't need them
+if (!defined($gdnsname))
 {
-    my $name = $cluster->{name};
+    # Header for default records
+    $zonefile->print("# Unknown origins\n");
 
-    if (my $default = $cluster->{default})
-    {
-        output_server($zonefile, "${default}.${zone}", $cluster);
-    }
-    elsif (exists($cluster->{default}))
+    # 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_server($zonefile, "${zone}", $cluster);
+        my $name = $cluster->{name};
+
+        if (my $default = $cluster->{default})
+        {
+            output_server($zonefile, $jszonefile, "${default}.${zone}", "${default}.${jszone}", $cluster);
+        }
+        elsif (exists($cluster->{default}))
+        {
+            output_server($zonefile, $jszonefile, "${zone}", "${jszone}", $cluster);
+        }
     }
 }
 
@@ -268,14 +284,23 @@ foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 {
     my $name = $cluster->{name};
 
-    output_server($zonefile, "${name}.${zone}", $cluster);
+    output_server($zonefile, $jszonefile, "${name}.${zone}", "${name}.${jszone}", $cluster);
+
+    if (@{$cluster->{servers}} > 1)
+    {
+        output_server($zonefile, $jszonefile, "${name}-%02d.${zone}", "${name}-%02d.${jszone}", $cluster);
+    }
 }
 
 # Output the GeoJSON text
 $jsonfile->print(encode_json(\@json));
 
+# Output footers
+$jszonefile->print("];\n");
+
 # Close the output files
 $jsonfile->close();
+$jszonefile->close();
 $zonefile->close();
 
 # Output gdnsd configuration
@@ -283,10 +308,11 @@ if (defined($gdnsname))
 {
     my $gdnsmapfile = IO::File->new("> gdns/${gdnsname}.map") || die "$!";
     my $gdnsresourcefile = IO::File->new("> gdns/${gdnsname}.resource") || die "$!";
+    my $gdnsweightedfile = IO::File->new("> gdns/${gdnsname}.weighted") || die "$!";
     my $continent = "";
 
     $gdnsmapfile->print("${gdnsname} => {\n");
-    $gdnsmapfile->print("  geoip2_db => /var/lib/GeoIP/GeoLite2-Country.mmdb\n");
+    $gdnsmapfile->print("  geoip2_db => /usr/share/GeoIP/GeoLite2-Country.mmdb\n");
     $gdnsmapfile->print("  datacenters => [" . join(",", sort(keys(%$clusters))) . "]\n");
     $gdnsmapfile->print("  map => {\n");
     $gdnsmapfile->print("    default => [" . join(",", sort(map { $_->{name} } grep { $_->{default} } values(%$clusters))) . "]\n");
@@ -323,12 +349,35 @@ if (defined($gdnsname))
     {
         my $name = $cluster->{name};
 
-        $gdnsresourcefile->print("    ${name} => ${name}.tile.openstreetmap.org.\n");
+        if (@{$cluster->{servers}} > 1)
+        {
+            $gdnsweightedfile->print("${name} => {\n");
+
+            while (my($index,$server) = each @{$cluster->{servers}})
+            {
+                if ($server->{status} eq "up")
+                {
+                    my $number = sprintf("%02d", $index + 1);
+                    my $bandwidth = $server->{bandwidth};
+
+                    $gdnsweightedfile->print("  ${name}-${number} = [ ${name}-${number}.${zone}., ${bandwidth} ]\n");
+                }
+            }
+
+            $gdnsweightedfile->print("}\n");
+
+            $gdnsresourcefile->print("    ${name} => %weighted!${name}\n");
+        }
+        else
+        {
+            $gdnsresourcefile->print("    ${name} => ${name}.${zone}.\n");
+        }
     }
 
     $gdnsresourcefile->print("  }\n");
     $gdnsresourcefile->print("}\n");
 
+    $gdnsweightedfile->close();
     $gdnsresourcefile->close();
     $gdnsmapfile->close();
 }
@@ -486,18 +535,26 @@ sub compare_bandwidth
 sub output_server
 {
     my $zonefile = shift;
+    my $jszonefile = shift;
     my $name = shift;
+    my $jsname = shift;
     my $cluster = shift;
 
-    foreach my $server (@{$cluster->{servers}})
+    while (my($index,$server) = each @{$cluster->{servers}})
     {
         if ($server->{status} eq "up")
         {
-            $zonefile->print("+${name}:$server->{ipv4}:600\n");
+            $zonefile->printf("+${name}:$server->{ipv4}:600\n", $index + 1);
+            $jszonefile->printf("  A(\"${jsname}\", \"$server->{ipv4}\", TTL(\"10m\")),\n", $index + 1);
 
             if ($server->{ipv6})
             {
-#                $zonefile->print("3${name}:$server->{ipv6}:600\n");
+                my $ipv6 = $server->{ipv6};
+
+                $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);
             }
         }
     }