Fix name of generated JSON files

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index d942ee0e603c1474c92d86159f8d779ebf35f345..9cfb6c124c6b9e421935af4126136df7c17426d5 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,58 +204,54 @@ 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 $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
+my $zonefile = IO::File->new("> include/${zone}.js") || die "$!";
+my $jsonfile = IO::File->new("> json/${zone}.openstreetmap.org.json") || die "$!";
 
 # Output headers
-$jszonefile->print("var \U${jszone}\E_RECORDS = [\n");
+$zonefile->print("var \U${zone}\E_RECORDS = [\n");
 
-# Skip outputting server map if gdnsd is doing that
-if (!defined($gdnsname))
+# 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)
-    {
-        my $cluster = $origin->{cluster};
-        my $clon = $origin->{lon};
-        my $clat = $origin->{lat};
-        my $slon = $cluster->{lon};
-        my $slat = $cluster->{lat};
-
-        if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon)
-        {
-            $slon = $slon + 360;
-        }
-        elsif ($slon > 0 && $clon < 0 && 360 + $clon - $slon < $slon - $clon)
-        {
-            $clon = $clon + 360;
-        }
+    my $cluster = $origin->{cluster};
+    my $clon = $origin->{lon};
+    my $clat = $origin->{lat};
+    my $slon = $cluster->{lon};
+    my $slat = $cluster->{lat};
 
-        $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",
-            geometry => {
-                type => "LineString",
-                coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ]
-            },
-            properties => {
-                origin => $origin->{name},
-                server => $cluster->{name},
-                colour => $cluster->{colour}
-            }
-        };
+    if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon)
+    {
+        $slon = $slon + 360;
+    }
+    elsif ($slon > 0 && $clon < 0 && 360 + $clon - $slon < $slon - $clon)
+    {
+        $clon = $clon + 360;
+    }
 
-        $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth};
+    if (!defined($gdnsname))
+    {
+        $zonefile->print("  CNAME(\"\L$origin->{code}\E.${zone}\", \"$cluster->{name}.${zone}.openstreetmap.org.\", TTL(\"10m\")),\n");
     }
 
-    # Header for default records
-    $zonefile->print("# Unknown origins\n");
+    push @json, {
+        type => "Feature",
+        geometry => {
+            type => "LineString",
+            coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ]
+        },
+        properties => {
+            origin => $origin->{name},
+            server => $cluster->{name},
+            colour => $cluster->{colour}
+        }
+    };
+
+    $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth};
+}
 
+# Skip default records if we don't need them
+if (!defined($gdnsname))
+{
     # Output default records for IPs that can't be mapped to a country
     foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
     {
@@ -264,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);
     }
 }
 
@@ -293,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
@@ -357,7 +348,7 @@ if (defined($gdnsname))
                     my $number = sprintf("%02d", $index + 1);
                     my $bandwidth = $server->{bandwidth};
 
-                    $gdnsweightedfile->print("  ${name}-${number} = [ ${name}-${number}.${zone}., ${bandwidth} ]\n");
+                    $gdnsweightedfile->print("  ${name}-${number} = [ ${name}-${number}.${zone}.openstreetmap.org., ${bandwidth} ]\n");
                 }
             }
 
@@ -367,7 +358,7 @@ if (defined($gdnsname))
         }
         else
         {
-            $gdnsresourcefile->print("    ${name} => ${name}.${zone}.\n");
+            $gdnsresourcefile->print("    ${name} => ${name}.${zone}.openstreetmap.org.\n");
         }
     }
 
@@ -532,26 +523,18 @@ 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})
             {
-                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);
+                $zonefile->printf("  AAAA(\"${name}\", \"$server->{ipv6}\", TTL(\"10m\")),\n", $index + 1);
             }
         }
     }