Publish TLSRPT reporting rule for MTA-STS errors

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index 6868af07ac7b1b00a04758dc89e892a0b2d9fd3a..f23d0c56c5d02c752aff6a17187f733e1e4ac8a5 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -294,7 +294,7 @@ if (defined($gdnsname))
     my $continent = "";
 
     $gdnsmapfile->print("${gdnsname} => {\n");
-    $gdnsmapfile->print("  geoip2_db => /var/lib/GeoIP/GeoLite2-Country.mmdb\n");
+    $gdnsmapfile->print("  geoip2_db => /usr/share/GeoIP/GeoLite2-Country.mmdb\n");
     $gdnsmapfile->print("  datacenters => [" . join(",", sort(keys(%$clusters))) . "]\n");
     $gdnsmapfile->print("  map => {\n");
     $gdnsmapfile->print("    default => [" . join(",", sort(map { $_->{name} } grep { $_->{default} } values(%$clusters))) . "]\n");
@@ -331,21 +331,28 @@ if (defined($gdnsname))
     {
         my $name = $cluster->{name};
 
-        $gdnsresourcefile->print("    ${name} => ${name}.${zone}.\n");
-
         if (@{$cluster->{servers}} > 1)
         {
             $gdnsweightedfile->print("${name} => {\n");
 
             while (my($index,$server) = each @{$cluster->{servers}})
             {
-                my $number = sprintf("%02d", $index + 1);
-                my $bandwidth = $server->{bandwidth};
+                if ($server->{status} eq "up")
+                {
+                    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}., ${bandwidth} ]\n");
+                }
             }
 
             $gdnsweightedfile->print("}\n");
+
+            $gdnsresourcefile->print("    ${name} => %weighted!${name}\n");
+        }
+        else
+        {
+            $gdnsresourcefile->print("    ${name} => ${name}.${zone}.\n");
         }
     }
 
@@ -521,7 +528,7 @@ sub output_server
 
             if ($server->{ipv6})
             {
-#                $zonefile->printf("3${name}:$server->{ipv6}:600\n", $index + 1);
+                $zonefile->printf("3${name}:$server->{ipv6}:600\n", $index + 1);
             }
         }
     }