X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/b7a789408d516daf93bea803f628bf3e69b9d5d0..1bb992b410661470118c0c49ba41f1d142e992e4:/bin/mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index 7b70c22..60c1abb 100755
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -69,7 +69,7 @@ if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
 
     if (-f "pingdom.yml")
     {
-        $cache = YAML::LoadFile("pingdom.yml"); 
+        $cache = YAML::LoadFile("pingdom.yml");
     }
     else
     {
@@ -94,6 +94,10 @@ if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
                 $server->{status} = $cache->{$server->{pingdom}} || "down";
             }
         }
+        else
+        {
+            $server->{status} = "down";
+        }
     }
 
     YAML::DumpFile("pingdom.yml", $cache);
@@ -185,7 +189,7 @@ my $zonefile = IO::File->new("> data/${zone}") || die "$!";
 my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
 
 # Output details for each country
-foreach my $origin (values %$origins)
+foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
 {
     my $cluster = $origin->{cluster};
     my $clon = $origin->{lon};
@@ -225,8 +229,10 @@ foreach my $origin (values %$origins)
 $zonefile->print("# Unknown origins\n");
 
 # Output default records for IPs that can't be mapped to a country
-while (my($name,$cluster) = each %$clusters)
+foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 {
+    my $name = $cluster->{name};
+
     if (my $default = $cluster->{default})
     {
         output_server($zonefile, "${default}.${zone}", $cluster);
@@ -241,8 +247,10 @@ while (my($name,$cluster) = each %$clusters)
 $zonefile->print("# Servers\n");
 
 # Output A records for each cluster
-while (my($name,$cluster) = each %$clusters)
+foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
 {
+    my $name = $cluster->{name};
+
     output_server($zonefile, "${name}.${zone}", $cluster);
 }
 
@@ -401,11 +409,11 @@ sub output_server
     {
         if ($server->{status} eq "up")
         {
-            $zonefile->print("+${name}:$server->{ipv4}:3600\n");
+            $zonefile->print("+${name}:$server->{ipv4}:600\n");
 
             if ($server->{ipv6})
             {
-#                $zonefile->print("3${name}:$server->{ipv6}:3600\n");
+#                $zonefile->print("3${name}:$server->{ipv6}:600\n");
             }
         }
     }