Output A records for the default name instead of CNAME records

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index f72666897f39a06c8fc3ac5dabb88de2292286ae..dcc192aab73271c861f7237a05cae8d21829be13 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -217,30 +217,29 @@ foreach my $origin (values %$origins)
     $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth};
 }
 
     $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
 # Output default records for IPs that can't be mapped to a country

-foreach my $cluster (grep { $clusters->{$_}->{default} } keys %$clusters)
+while (my($name,$cluster) = each %$clusters)

 {
 {

-    $zonefile->print("# Unknown origins\n");
-    $zonefile->print("Cxx.${zone}:${cluster}.${zone}:600\n");
+    if (my $default = $cluster->{default})
+    {
+        output_server($zonefile, "${default}.${zone}", $cluster);
+    }
+    elsif (exists($cluster->{default}))
+    {
+        output_server($zonefile, "${zone}", $cluster);
+    }

 }
 
 }
 

+# Header for underlying servers

 $zonefile->print("# Servers\n");
 
 # Output A records for each cluster
 while (my($name,$cluster) = each %$clusters)
 {
 $zonefile->print("# Servers\n");
 
 # Output A records for each cluster
 while (my($name,$cluster) = each %$clusters)
 {

-    foreach my $server (@{$cluster->{servers}})
-    {
-        if ($server->{status} eq "up")
-        {
-            $zonefile->print("+${name}.${zone}:$server->{ipv4}:600\n");
-
-            if ($server->{ipv6})
-            {
-#                $zonefile->print("3${name}.${zone}:$server->{ipv6}:600\n");
-            }
-        }
-    }
+    output_server($zonefile, "${name}.${zone}", $cluster);

 }
 
 # Output the GeoJSON text
 }
 
 # Output the GeoJSON text


@@ -384,3 +383,28 @@ sub compare_bandwidth
 
     return $a_used <=> $b_used;
 }
 
     return $a_used <=> $b_used;
 }

+
+#
+# Output DNS records for a server
+#
+sub output_server
+{
+    my $zonefile = shift;
+    my $name = shift;
+    my $cluster = shift;
+
+    foreach my $server (@{$cluster->{servers}})
+    {
+        if ($server->{status} eq "up")
+        {
+            $zonefile->print("+${name}:$server->{ipv4}:600\n");
+
+            if ($server->{ipv6})
+            {
+#                $zonefile->print("3${name}:$server->{ipv6}:600\n");
+            }
+        }
+    }
+
+    return;
+}