Use standard formatting for IPv6 addresses

diff --git a/bin/mkgeo b/bin/mkgeo
index 400fff7cdc4dc24cde40c076f42086e2952fd8e7..e02fbeeb27331b7599b91492230875223dbf2436 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -534,11 +534,7 @@ sub output_server
 
             if ($server->{ipv6})
             {
 
             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);

             }
         }
     }
             }
         }
     }

diff --git a/src/nominatim.openstreetmap.yml b/src/nominatim.openstreetmap.yml
index b99d7ffcd6c1959e185b0fcb817105020593b16c..3b4df84d30e4b7b3e9210bf7a22599be33615924 100644 (file)
--- a/src/nominatim.openstreetmap.yml
+++ b/src/nominatim.openstreetmap.yml
@@ -7,7 +7,7 @@ amsterdam:
   colour: "#8dd3c7"
   bandwidth: 1
   ipv4: 130.117.76.9
   colour: "#8dd3c7"
   bandwidth: 1
   ipv4: 130.117.76.9

-  ipv6: 200109780002002c0000000001720009
+  ipv6: 2001:978:2:2c::172:9

 
 slough:
   lat: 51.5228002
 
 slough:
   lat: 51.5228002

diff --git a/src/render.openstreetmap.yml b/src/render.openstreetmap.yml
index e413eb60bddf1197be4fe14c7b801d718291874c..4214507e6c778951bdeaf61704602d0c2b0bf784 100644 (file)
--- a/src/render.openstreetmap.yml
+++ b/src/render.openstreetmap.yml
@@ -21,7 +21,7 @@ odin:
   colour: "#7c1f7c"
   bandwidth: 800
   ipv4: 130.117.76.15
   colour: "#7c1f7c"
   bandwidth: 800
   ipv4: 130.117.76.15

-  ipv6: 200109780002002c000000000172000F
+  ipv6: 2001:978:2:2c::172:f

   default: ""
   preferred:
     origins:
   default: ""
   preferred:
     origins:


@@ -48,7 +48,7 @@ scorch:
   colour: "#bf8230"
   bandwidth: 400
   ipv4: 176.31.235.79
   colour: "#bf8230"
   bandwidth: 400
   ipv4: 176.31.235.79

-  ipv6: 200141d00002fc4f0000000000000001
+  ipv6: 2001:41d0:2:fc4f::1

   default: ""
   preferred:
     origins:
   default: ""
   preferred:
     origins:


@@ -76,7 +76,7 @@ pyrene:
   colour: "#269926"
   bandwidth: 600
   ipv4: 140.211.167.98
   colour: "#269926"
   bandwidth: 600
   ipv4: 140.211.167.98

-  ipv6: 2605bc8030100700000000008cd3a762
+  ipv6: 2605:bc80:3010:700::8cd3:a762

   default: ""
   preferred:
     origins:
   default: ""
   preferred:
     origins:

diff --git a/src/tile.openstreetmap.yml b/src/tile.openstreetmap.yml
index 48f6b5445d7fcc1f3728c345b68f1c8cef6b6e74..f0c5c5a24817f0edb65880bc1d15ad18a35ab437 100644 (file)
--- a/src/tile.openstreetmap.yml
+++ b/src/tile.openstreetmap.yml
@@ -9,7 +9,7 @@ moscow:
   colour: "#8dd3c7"
   bandwidth: 200
   ipv4: 5.45.248.21
   colour: "#8dd3c7"
   bandwidth: 200
   ipv4: 5.45.248.21

-  ipv6: 2a0206b8b0105065000000000000a001
+  ipv6: 2a02:6b8:b010:5065::a001

   allowed:
     countries:
       - AZ
   allowed:
     countries:
       - AZ


@@ -48,7 +48,7 @@ netherlands:
         - 5406588
       bandwidth: 60
       ipv4: 31.3.110.20
         - 5406588
       bandwidth: 60
       ipv4: 31.3.110.20

-      ipv6: 2a037900011100000031000301100020
+      ipv6: 2a03:7900:111:0:31:3:110:20

 
 # Oslo, NO
 # BW Limit: 1000Mb/s
 
 # Oslo, NO
 # BW Limit: 1000Mb/s


@@ -74,7 +74,7 @@ sanfrancisco:
   colour: "#e31a1c"
   bandwidth: 60
   ipv4: 71.19.155.177
   colour: "#e31a1c"
   bandwidth: 60
   ipv4: 71.19.155.177

-  ipv6: 2605270000000017a80000fffe3ecdca
+  ipv6: 2605:2700:0:17:a800:ff:fe3e:cdca

   preferred:
     countries:
       - CN
   preferred:
     countries:
       - CN


@@ -95,28 +95,28 @@ france:
       bandwidth: 100
       name: nepomuk
       ipv4: 77.95.65.39
       bandwidth: 100
       name: nepomuk
       ipv4: 77.95.65.39

-      ipv6: 2a039180000001000000000000000007
+      ipv6: 2a03:9180:0:100::7

     - statuscake:
         - 3351567
         - 3351569
       bandwidth: 100
       name: noomoahk
       ipv4: 91.224.148.166
     - statuscake:
         - 3351567
         - 3351569
       bandwidth: 100
       name: noomoahk
       ipv4: 91.224.148.166

-      ipv6: 2a0372208080a6000000000000000001
+      ipv6: 2a03:7220:8080:a600::1

     - statuscake:
         - 3743694
         - 3743696
       bandwidth: 60
       name: norbert
       ipv4: 89.234.186.100
     - statuscake:
         - 3743694
         - 3743696
       bandwidth: 60
       name: norbert
       ipv4: 89.234.186.100

-      ipv6: 2a005884821c00000000000000000001
+      ipv6: 2a00:5884:821c::1

     - statuscake:
         - 3750719
         - 3750717
       bandwidth: 40
       name: necrosan
       ipv4: 80.67.167.77
     - statuscake:
         - 3750719
         - 3750717
       bandwidth: 40
       name: necrosan
       ipv4: 80.67.167.77

-      ipv6: 2a0bcbc0110d0001000000000000001c
+      ipv6: 2a0b:cbc0:110d:1::1c

     - statuscake:
         - 5321339
         - 5321340
     - statuscake:
         - 5321339
         - 5321340


@@ -145,28 +145,28 @@ germany:
       bandwidth: 80
       name: katie
       ipv4: 144.76.70.77
       bandwidth: 80
       name: katie
       ipv4: 144.76.70.77

-      ipv6: 2a0104f80191834c0000000000000002
+      ipv6: 2a01:4f8:191:834c::2

     - statuscake:
         - 2217271
         - 2217272
       bandwidth: 80
       name: konqi
       ipv4: 81.7.11.83
     - statuscake:
         - 2217271
         - 2217272
       bandwidth: 80
       name: konqi
       ipv4: 81.7.11.83

-      ipv6: 2a020180000100010000000005170b53
+      ipv6: 2a02:180:1:1::517:b53

     - statuscake:
         - 2217293
         - 2217294
       bandwidth: 80
       name: kalessin
       ipv4: 185.66.195.245
     - statuscake:
         - 2217293
         - 2217294
       bandwidth: 80
       name: kalessin
       ipv4: 185.66.195.245

-      ipv6: 2a032260200000010000000000000005
+      ipv6: 2a03:2260:2000:1::5

     - statuscake:
         - 3750847
         - 3750842
       bandwidth: 120
       name: keizer
       ipv4: 195.201.226.63
     - statuscake:
         - 3750847
         - 3750842
       bandwidth: 120
       name: keizer
       ipv4: 195.201.226.63

-      ipv6: 2a0104f81c1cbc540000000000000001
+      ipv6: 2a01:4f8:1c1c:bc54::1

   allowed:
     countries:
       - DE
   allowed:
     countries:
       - DE


@@ -207,7 +207,7 @@ hsinchu:
     - 2217278
   bandwidth: 200
   ipv4: 140.110.240.7
     - 2217278
   bandwidth: 200
   ipv4: 140.110.240.7

-  ipv6: 20010e10200002400000000000000007
+  ipv6: 2001:e10:2000:240::7

   allowed:
     continents:
       - AS
   allowed:
     continents:
       - AS


@@ -229,7 +229,7 @@ pula:
   colour: "#a6cee3"
   bandwidth: 120
   ipv4: 193.198.233.211
   colour: "#a6cee3"
   bandwidth: 120
   ipv4: 193.198.233.211

-  ipv6: 20010b684cff00030000000000000003
+  ipv6: 2001:b68:4cff:3::3

   default: "xx"
 
 # Osijek, HR
   default: "xx"
 
 # Osijek, HR


@@ -242,7 +242,7 @@ osijek:
   colour: "#fb8072"
   bandwidth: 120
   ipv4: 161.53.30.107
   colour: "#fb8072"
   bandwidth: 120
   ipv4: 161.53.30.107

-  ipv6: 20010b68c0ff000002215efffe40c7c4
+  ipv6: 2001:b68:c0ff:0:221:5eff:fe40:c7c4

   default: "xx"
 
 # London, GB
   default: "xx"
 
 # London, GB


@@ -257,14 +257,14 @@ london:
       bandwidth: 150
       name: saphira
       ipv4: 185.73.44.30
       bandwidth: 150
       name: saphira
       ipv4: 185.73.44.30

-      ipv6: 20010ba800002c1e0000000000000000
+      ipv6: 2001:ba8:0:2c1e::

     - statuscake:
        - 4089249
        - 4089250
       bandwidth: 150
       name: toothless
       ipv4: 185.73.44.167
     - statuscake:
        - 4089249
        - 4089250
       bandwidth: 150
       name: toothless
       ipv4: 185.73.44.167

-      ipv6: 20010ba800002ca70000000000000000
+      ipv6: 2001:ba8:0:2ca7::

   preferred:
     countries:
       - GB
   preferred:
     countries:
       - GB


@@ -281,7 +281,7 @@ corvallis:
   colour: "#6a3d9a"
   bandwidth: 200
   ipv4: 140.211.167.105
   colour: "#6a3d9a"
   bandwidth: 200
   ipv4: 140.211.167.105

-  ipv6: 2605bc8030100700000000008cdea769
+  ipv6: 2605:bc80:3010:700::8cde:a769

   preferred:
     countries:
       - US
   preferred:
     countries:
       - US


@@ -296,7 +296,7 @@ budapest:
   colour: "#fdbf6f"
   bandwidth: 80
   ipv4: 37.17.173.8
   colour: "#fdbf6f"
   bandwidth: 80
   ipv4: 37.17.173.8

-  ipv6: 20014c480002bf04025056fffe8f5c81
+  ipv6: 2001:4c48:2:bf04:250:56ff:fe8f:5c81

 
 # Minsk, BY
 minsk:
 
 # Minsk, BY
 minsk:


@@ -308,7 +308,7 @@ minsk:
   colour: "#ffed6f"
   bandwidth: 80
   ipv4: 31.130.201.40
   colour: "#ffed6f"
   bandwidth: 80
   ipv4: 31.130.201.40

-  ipv6: 2001067c22681005021e8cfffe8c8d3b
+  ipv6: 2001:67c:2268:1005:21e:8cff:fe8c:8d3b

   allowed:
     countries:
       - BY
   allowed:
     countries:
       - BY


@@ -326,7 +326,7 @@ aalborg:
   colour: "#80b1d3"
   bandwidth: 160
   ipv4: 130.225.254.109
   colour: "#80b1d3"
   bandwidth: 160
   ipv4: 130.225.254.109

-  ipv6: 20010878034600000000000000000109
+  ipv6: 2001:878:346::109

   default: "xx"
 
 # Zaragoza, ES
   default: "xx"
 
 # Zaragoza, ES


@@ -350,7 +350,7 @@ athens:
   colour: "#b3de69"
   bandwidth: 80
   ipv4: 83.212.2.116
   colour: "#b3de69"
   bandwidth: 80
   ipv4: 83.212.2.116

-  ipv6: 200106482ffe00040000000000000116
+  ipv6: 2001:648:2ffe:4::116

 
 # Montréal, CA
 montreal:
 
 # Montréal, CA
 montreal:


@@ -376,7 +376,7 @@ capetown:
   colour: "#cab2d6"
   bandwidth: 10
   ipv4: 196.10.54.165
   colour: "#cab2d6"
   bandwidth: 10
   ipv4: 196.10.54.165

-  ipv6: 200143f801f40b00b283fefffed8dd45
+  ipv6: 2001:43f8:1f4:b00:b283:feff:fed8:dd45

   allowed:
     countries:
       - BW
   allowed:
     countries:
       - BW


@@ -412,7 +412,7 @@ zurich:
   colour: "#ccebc5"
   bandwidth: 200
   ipv4: 217.71.244.22
   colour: "#ccebc5"
   bandwidth: 200
   ipv4: 217.71.244.22

-  ipv6: 200108e0004020390000000000000010
+  ipv6: 2001:8e0:40:2039::10

   preferred:
     countries:
       - CH
   preferred:
     countries:
       - CH


@@ -430,7 +430,7 @@ kiev:
   colour: "#fb9a99"
   bandwidth: 70
   ipv4: 176.122.99.101
   colour: "#fb9a99"
   bandwidth: 70
   ipv4: 176.122.99.101

-  ipv6: 2001067c2d4000000000000000000065
+  ipv6: 2001:67c:2d40::65

 
 # Hamilton/Wellington, NZ
 # Hamilton @ -37.783333,175.283333
 
 # Hamilton/Wellington, NZ
 # Hamilton @ -37.783333,175.283333


@@ -446,7 +446,7 @@ newzealand:
       bandwidth: 10
       name: tuatara
       ipv4: 114.23.141.203
       bandwidth: 10
       name: tuatara
       ipv4: 114.23.141.203

-      ipv6: 24061e00b4100c24529a4cfffe79bc3b
+      ipv6: 2406:1e00:b410:c24:529a:4cff:fe79:bc3b

     - statuscake:
         - 3931336
         - 3931337
     - statuscake:
         - 3931336
         - 3931337


@@ -501,14 +501,14 @@ sweden:
       bandwidth: 40
       name: nidhogg
       ipv4: 130.236.254.221
       bandwidth: 40
       name: nidhogg
       ipv4: 130.236.254.221

-      ipv6: 200106b00017f0a000000000000000dd
+      ipv6: 2001:6b0:17:f0a0::dd

     - statuscake:
         - 3949588
         - 3949589
       bandwidth: 80
       name: fafnir
       ipv4: 130.239.18.114
     - statuscake:
         - 3949588
         - 3949589
       bandwidth: 80
       name: fafnir
       ipv4: 130.239.18.114

-      ipv6: 200106b0000e2a180000000000000114
+      ipv6: 2001:6b0:e:2a18::114

 
 # Curitiba, BR
 curitiba:
 
 # Curitiba, BR
 curitiba:


@@ -520,7 +520,7 @@ curitiba:
   colour: "#d9d9d9"
   bandwidth: 80
   ipv4: 200.236.31.207
   colour: "#d9d9d9"
   bandwidth: 80
   ipv4: 200.236.31.207

-  ipv6: 2801008280ff80020216ccfffeaa0021
+  ipv6: 2801:82:80ff:8002:216:ccff:feaa:21

   allowed:
     countries:
       - BR
   allowed:
     countries:
       - BR