Don't leave temporary files lying around

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index 76316b08e1b0b92032381cdd85ff00586c3fdf3f..6944c456c550631034ac1a9045802a4f1845d4e3 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -9,15 +9,14 @@ use IO::File;
 use Math::Trig qw(deg2rad pip2 great_circle_distance);
 use JSON::XS;
 use LWP::UserAgent;
-use YAML;
+use YAML::XS qw(LoadFile DumpFile);
 
 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 $origins = LoadFile($originfile);
+my $clusters = LoadFile($clusterfile);
 my $gdnsname = shift @ARGV;
 my @servers;
 
@@ -73,7 +72,7 @@ if ($ENV{STATUSCAKE_USERNAME} && $ENV{STATUSCAKE_APIKEY})
 
     if (-f "statuscake.yml")
     {
-        $cache = YAML::LoadFile("statuscake.yml");
+        $cache = LoadFile("statuscake.yml");
     }
     else
     {
@@ -120,7 +119,8 @@ if ($ENV{STATUSCAKE_USERNAME} && $ENV{STATUSCAKE_APIKEY})
         }
     }
 
-    YAML::DumpFile("statuscake.yml", $cache);
+    DumpFile("statuscake-$$.yml", $cache);
+    rename("statuscake-$$.yml", "statuscake.yml");
 }
 
 # Mark a cluster as up if any servers are up
@@ -205,12 +205,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 $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");
 
 # Output details for each country
 foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
@@ -230,10 +229,10 @@ 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");
-
-    $jszonefile->print("  CNAME(\"\L$origin->{code}\E.${jszone}\", \"$cluster->{name}.${zone}.\", TTL(\"10m\")),\n");
+    if (!defined($gdnsname))
+    {
+        $zonefile->print("  CNAME(\"\L$origin->{code}\E.${zone}\", \"$cluster->{name}.${zone}.openstreetmap.org.\", TTL(\"10m\")),\n");
+    }
 
     push @json, {
         type => "Feature",
@@ -251,37 +250,37 @@ 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};
-
-    if (my $default = $cluster->{default})
-    {
-        output_server($zonefile, $jszonefile, "${default}.${zone}", "${default}.${jszone}", $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, $jszonefile, "${zone}", "${jszone}", $cluster);
+        my $name = $cluster->{name};
+
+        if (my $default = $cluster->{default})
+        {
+            output_server($zonefile, "${default}.${zone}", $cluster, 0);
+        }
+        elsif (exists($cluster->{default}))
+        {
+            output_server($zonefile, "${zone}", $cluster, 0);
+        }
     }
 }
 
-# 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);
-
     if (@{$cluster->{servers}} > 1)
     {
-        output_server($zonefile, $jszonefile, "${name}-%02d.${zone}", "${name}-%02d.${jszone}", $cluster);
+        output_server($zonefile, "${name}-%02d.${zone}", $cluster, 1);
+    }
+    else
+    {
+        output_server($zonefile, "${name}.${zone}", $cluster, 1);
     }
 }
 
@@ -289,11 +288,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
@@ -342,7 +340,7 @@ if (defined($gdnsname))
     {
         my $name = $cluster->{name};
 
-        if (@{$cluster->{servers}} > 1)
+        if (@{$cluster->{servers}} > 1 && grep { $_->{status} eq "up" } @{$cluster->{servers}})
         {
             $gdnsweightedfile->print("${name} => {\n");
 
@@ -353,7 +351,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");
                 }
             }
 
@@ -363,7 +361,7 @@ if (defined($gdnsname))
         }
         else
         {
-            $gdnsresourcefile->print("    ${name} => ${name}.${zone}.\n");
+            $gdnsresourcefile->print("    ${name} => ${name}.${zone}.openstreetmap.org.\n");
         }
     }
 
@@ -376,7 +374,7 @@ if (defined($gdnsname))
 }
 
 # Output the target details in origin format if required
-YAML::DumpFile($targetoriginfile, $targetorigins) if $targetoriginfile;
+DumpFile($targetoriginfile, $targetorigins) if $targetoriginfile;
 
 exit 0;
 
@@ -528,26 +526,19 @@ sub compare_bandwidth
 sub output_server
 {
     my $zonefile = shift;
-    my $jszonefile = shift;
     my $name = shift;
-    my $jsname = shift;
     my $cluster = shift;
+    my $all = shift;
 
     while (my($index,$server) = each @{$cluster->{servers}})
     {
-        if ($server->{status} eq "up")
+        if ($all || $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);
             }
         }
     }