X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/191e37e08db0f5bd7f60bb1ab0137d90bcdc2125..abb152df07840ebde87b36015026c9c0d87991ba:/bin/mkgeo diff --git a/bin/mkgeo b/bin/mkgeo index 400fff7..881f268 100755 --- a/bin/mkgeo +++ b/bin/mkgeo @@ -348,7 +348,7 @@ if (defined($gdnsname)) 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}.openstreetmap.org., ${bandwidth} ]\n"); } } @@ -358,7 +358,7 @@ if (defined($gdnsname)) } else { - $gdnsresourcefile->print(" ${name} => ${name}.${zone}.\n"); + $gdnsresourcefile->print(" ${name} => ${name}.${zone}.openstreetmap.org.\n"); } } @@ -534,11 +534,7 @@ sub output_server if ($server->{ipv6}) { - my $ipv6 = $server->{ipv6}; - - $ipv6 =~ s/([0-9a-f]{4})(?=.)/$1:/ig; - - $zonefile->printf(" AAAA(\"${name}\", \"${ipv6}\", TTL(\"10m\")),\n", $index + 1); + $zonefile->printf(" AAAA(\"${name}\", \"$server->{ipv6}\", TTL(\"10m\")),\n", $index + 1); } } }