X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/b2c5ec8ad66c3c2070a509e79a87e92727280bb3..22b6dfd4a49224805ef6515c64f74c98bbfe53f6:/bin/mkgeo?ds=sidebyside diff --git a/bin/mkgeo b/bin/mkgeo index 1b9f87f..7373c2d 100755 --- a/bin/mkgeo +++ b/bin/mkgeo @@ -1,5 +1,7 @@ #!/usr/bin/perl +use v5.12; + use strict; use warnings; @@ -7,14 +9,15 @@ 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 $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; # Initialise cluster details @@ -38,6 +41,7 @@ while (my($name,$cluster) = each %$clusters) cluster => $cluster, statuscake => $cluster->{statuscake}, bandwidth => $cluster->{bandwidth}, + cname => $cluster->{cname}, ipv4 => $cluster->{ipv4}, ipv6 => $cluster->{ipv6} }; @@ -69,7 +73,7 @@ if ($ENV{STATUSCAKE_USERNAME} && $ENV{STATUSCAKE_APIKEY}) if (-f "statuscake.yml") { - $cache = YAML::LoadFile("statuscake.yml"); + $cache = LoadFile("statuscake.yml"); } else { @@ -116,7 +120,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 @@ -141,6 +146,8 @@ while (my($name,$cluster) = each %$clusters) $cluster->{bandwidth_limit} = $cluster->{bandwidth} * 1024 * 1024; $cluster->{bandwidth_used} = 0; + next if $cluster->{global}; + $targetorigins->{$cluster->{name}} = { code => $cluster->{name}, name => $cluster->{name}, @@ -162,7 +169,16 @@ foreach my $origin (values %$origins) if ($cluster->{status} eq "up" && $match ne "denied") { my $priority = $match eq "preferred" ? 20 : 10; - my $distance = distance($origin->{lat}, $origin->{lon}, $cluster->{lat}, $cluster->{lon}); + my $distance; + + if ($cluster->{global}) + { + $distance = 0; + } + else + { + $distance = distance($origin->{lat}, $origin->{lon}, $cluster->{lat}, $cluster->{lon}); + } push @mappings, { origin => $origin, cluster => $cluster, @@ -201,84 +217,193 @@ while (grep { !exists($_->{cluster}) } values %$origins) my @json; # Open output files -my $zonefile = IO::File->new("> data/${zone}") || 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 +$zonefile->print("var \U${zone}\E_RECORDS = [\n"); # Output details for each country foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins) { my $cluster = $origin->{cluster}; - my $clon = $origin->{lon}; - my $clat = $origin->{lat}; - my $slon = $cluster->{lon}; - my $slat = $cluster->{lat}; - if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon) + if (!defined($gdnsname)) { - $slon = $slon + 360; + $zonefile->print(" CNAME(\"\L$origin->{code}\E.${zone}\", \"$cluster->{name}.${zone}.openstreetmap.org.\", TTL(\"10m\")),\n"); } - elsif ($slon > 0 && $clon < 0 && 360 + $clon - $slon < $slon - $clon) + + if ($cluster->{lon} && $cluster->{lat}) { - $clon = $clon + 360; - } + my $clon = $origin->{lon}; + my $clat = $origin->{lat}; + my $slon = $cluster->{lon}; + my $slat = $cluster->{lat}; - $zonefile->print("# $origin->{name}\n"); - $zonefile->print("C\L$origin->{code}\E.${zone}:$cluster->{name}.${zone}:600\n"); - - push @json, { - type => "Feature", - geometry => { - type => "LineString", - coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ] - }, - properties => { - origin => $origin->{name}, - server => $cluster->{name}, - colour => $cluster->{colour} + if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon) + { + $slon = $slon + 360; } - }; + elsif ($slon > 0 && $clon < 0 && 360 + $clon - $slon < $slon - $clon) + { + $clon = $clon + 360; + } + + push @json, { + type => "Feature", + geometry => { + type => "LineString", + coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ] + }, + properties => { + origin => $origin->{name}, + server => $cluster->{name}, + colour => $cluster->{colour} + } + }; + } + + next if $cluster->{global}; $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 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, "${default}.${zone}", $cluster); - } - elsif (exists($cluster->{default})) - { - output_server($zonefile, "${zone}", $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, "${name}.${zone}", $cluster); + if (@{$cluster->{servers}} > 1) + { + output_server($zonefile, "${name}-%02d.${zone}", $cluster, 1); + } + else + { + output_server($zonefile, "${name}.${zone}", $cluster, 1); + } } # Output the GeoJSON text $jsonfile->print(encode_json(\@json)); +# Output footers +$zonefile->print("];\n"); + # Close the output files -$jsonfile->close(); $zonefile->close(); +$zonefile->close(); + +# Output gdnsd configuration +if (defined($gdnsname)) +{ + my $gdnsmapfile = IO::File->new("> gdns/${gdnsname}.map") || die "$!"; + my $gdnsresourcefile = IO::File->new("> gdns/${gdnsname}.resource") || die "$!"; + my $gdnsweightedfile = IO::File->new("> gdns/${gdnsname}.weighted") || die "$!"; + my $continent = ""; + + $gdnsmapfile->print("${gdnsname} => {\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"); + + foreach my $origin (sort { $a->{continent} cmp $b->{continent} || $a->{code} cmp $b->{code} } values %$origins) + { + my $code = $origin->{code}; + my $cluster = $origin->{cluster}->{name}; + + next if $code eq "XK"; + + if ($continent ne $origin->{continent}) + { + $gdnsmapfile->print(" }\n") if $continent; + + $continent = $origin->{continent}; + + $gdnsmapfile->print(" ${continent} => {\n"); + } + + $gdnsmapfile->print(" ${code} => [${cluster}]\n"); + } + + $gdnsmapfile->print(" }\n") if $continent; + + $gdnsmapfile->print(" }\n"); + $gdnsmapfile->print("}\n"); + + $gdnsresourcefile->print("${gdnsname} => {\n"); + $gdnsresourcefile->print(" map => ${gdnsname}\n"); + $gdnsresourcefile->print(" dcmap => {\n"); + + foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters) + { + my $name = $cluster->{name}; + + if (@{$cluster->{servers}} > 1 && grep { $_->{status} eq "up" } @{$cluster->{servers}}) + { + $gdnsweightedfile->print("${name} => {\n"); + + while (my($index,$server) = each @{$cluster->{servers}}) + { + if ($server->{status} eq "up") + { + my $number = sprintf("%02d", $index + 1); + my $bandwidth = $server->{bandwidth}; + + if (my $cname = $server->{cname}) + { + $gdnsweightedfile->print(" ${name}-${number} = [ ${cname}., ${bandwidth} ]\n"); + } + else + { + $gdnsweightedfile->print(" ${name}-${number} = [ ${name}-${number}.${zone}.openstreetmap.org., ${bandwidth} ]\n"); + } + } + } + + $gdnsweightedfile->print("}\n"); + + $gdnsresourcefile->print(" ${name} => %weighted!${name}\n"); + } + elsif (my $cname = $cluster->{cname}) + { + $gdnsresourcefile->print(" ${name} => ${cname}.\n"); + } + else + { + $gdnsresourcefile->print(" ${name} => ${name}.${zone}.openstreetmap.org.\n"); + } + } + + $gdnsresourcefile->print(" }\n"); + $gdnsresourcefile->print("}\n"); + + $gdnsweightedfile->close(); + $gdnsresourcefile->close(); + $gdnsmapfile->close(); +} # Output the target details in origin format if required -YAML::DumpFile($targetoriginfile, $targetorigins) if $targetoriginfile; +DumpFile($targetoriginfile, $targetorigins) if $targetoriginfile; exit 0; @@ -432,16 +557,20 @@ sub output_server my $zonefile = shift; my $name = shift; my $cluster = shift; + my $all = shift; - foreach my $server (@{$cluster->{servers}}) + while (my($index,$server) = each @{$cluster->{servers}}) { - if ($server->{status} eq "up") + if ($all || $server->{status} eq "up") { - $zonefile->print("+${name}:$server->{ipv4}:600\n"); + if ($server->{ipv4}) + { + $zonefile->printf(" A(\"${name}\", \"$server->{ipv4}\", TTL(\"10m\")),\n", $index + 1); + } if ($server->{ipv6}) { -# $zonefile->print("3${name}:$server->{ipv6}:600\n"); + $zonefile->printf(" AAAA(\"${name}\", \"$server->{ipv6}\", TTL(\"10m\")),\n", $index + 1); } } }