Shorter TTL for donate.osm.org

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index 40527e2d0e45c0f4e378496d349f033e4e13eeee..60c1abbea18e62f92ef8222e14e6bad88b56e6ef 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -69,7 +69,7 @@ if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
 
     if (-f "pingdom.yml")
     {
 
     if (-f "pingdom.yml")
     {

-        $cache = YAML::LoadFile("pingdom.yml"); 
+        $cache = YAML::LoadFile("pingdom.yml");

     }
     else
     {
     }
     else
     {


@@ -94,6 +94,10 @@ if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
                 $server->{status} = $cache->{$server->{pingdom}} || "down";
             }
         }
                 $server->{status} = $cache->{$server->{pingdom}} || "down";
             }
         }

+        else
+        {
+            $server->{status} = "down";
+        }

     }
 
     YAML::DumpFile("pingdom.yml", $cache);
     }
 
     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
 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};
 {
     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
 $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);
     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
 $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);
 }
 
     output_server($zonefile, "${name}.${zone}", $cluster);
 }
 


@@ -273,33 +281,33 @@ sub match_origin
     {
         $match = "preferred";
     }
     {
         $match = "preferred";
     }

-    elsif ($cluster->{preferred} &&
-           $cluster->{preferred}->{continents} &&
-           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
-    {
-        $match = "preferred";
-    }

     elsif ($cluster->{allowed} &&
            $cluster->{allowed}->{countries} &&
            grep { $_ eq $origin->{country} } @{$cluster->{allowed}->{countries}})
     {
         $match = "allowed";
     }
     elsif ($cluster->{allowed} &&
            $cluster->{allowed}->{countries} &&
            grep { $_ eq $origin->{country} } @{$cluster->{allowed}->{countries}})
     {
         $match = "allowed";
     }

+    elsif ($cluster->{denied} &&
+           $cluster->{denied}->{countries} &&
+           grep { $_ eq $origin->{country} } @{$cluster->{denied}->{countries}})
+    {
+        $match = "denied";
+    }
+    elsif ($cluster->{preferred} &&
+           $cluster->{preferred}->{continents} &&
+           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
+    {
+        $match = "preferred";
+    }

     elsif ($cluster->{allowed} &&
            $cluster->{allowed}->{continents} &&
            grep { $_ eq $origin->{continent} } @{$cluster->{allowed}->{continents}})
     {
         $match = "allowed";
     }
     elsif ($cluster->{allowed} &&
            $cluster->{allowed}->{continents} &&
            grep { $_ eq $origin->{continent} } @{$cluster->{allowed}->{continents}})
     {
         $match = "allowed";
     }

-    elsif ($cluster->{denied} &&
-           $cluster->{denied}->{countries} &&
-           grep { $_ eq $origin->{country} } @{$cluster->{preferred}->{countries}})
-    {
-        $match = "denied";
-    }

     elsif ($cluster->{denied} &&
            $cluster->{denied}->{continents} &&
     elsif ($cluster->{denied} &&
            $cluster->{denied}->{continents} &&

-           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
+           grep { $_ eq $origin->{continent} } @{$cluster->{denied}->{continents}})

     {
         $match = "denied";
     }
     {
         $match = "denied";
     }


@@ -401,11 +409,11 @@ sub output_server
     {
         if ($server->{status} eq "up")
         {
     {
         if ($server->{status} eq "up")
         {

-            $zonefile->print("+${name}:$server->{ipv4}:3600\n");
+            $zonefile->print("+${name}:$server->{ipv4}:600\n");

 
             if ($server->{ipv6})
             {
 
             if ($server->{ipv6})
             {

-#                $zonefile->print("3${name}:$server->{ipv6}:3600\n");
+#                $zonefile->print("3${name}:$server->{ipv6}:600\n");

             }
         }
     }
             }
         }
     }