Point render.osm.org at whichever rendering servers are available

diff --git a/bin/mkgeo b/bin/mkgeo
index f72666897f39a06c8fc3ac5dabb88de2292286ae..33a05b0e5086f11123bccd5e80914291e7a70da0 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -217,13 +217,23 @@ 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})
+    {
+        $zonefile->print("C${default}.${zone}:${name}.${zone}:600\n");
+    }
+    elsif (exists($cluster->{default}))
+    {
+        $zonefile->print("C${zone}:${name}.${zone}:600\n");
+    }

 }
 
 }
 

+# Header for underlying servers

 $zonefile->print("# Servers\n");
 
 # Output A records for each cluster
 $zonefile->print("# Servers\n");
 
 # Output A records for each cluster

diff --git a/src/render.openstreetmap b/src/render.openstreetmap
index 70764c1d4ab537a489bbd6b1f09329a0221326df..08a721019dce4dac81e5ac64e9f6911fb6f2d7d7 100644 (file)
--- a/src/render.openstreetmap
+++ b/src/render.openstreetmap
@@ -6,6 +6,7 @@ orm:
   bandwidth: 500
   ipv4: 193.63.75.98
   ipv6: 200106300012050002e081fffec52a8c
   bandwidth: 500
   ipv4: 193.63.75.98
   ipv6: 200106300012050002e081fffec52a8c

+  default: ""

 
 yevaud:
   lat: 51.507222
 
 yevaud:
   lat: 51.507222


@@ -14,6 +15,7 @@ yevaud:
   colour: "#412c84"
   bandwidth: 250
   ipv4: 128.40.168.104
   colour: "#412c84"
   bandwidth: 250
   ipv4: 128.40.168.104

+  default: ""

 
 # Spare colours:
 #
 
 # Spare colours:
 #

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index fb587df7314b88897a2b08de57628e7db472f038..7aebfc90ec944a2cee9437f44ce2748b488520e5 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -71,7 +71,7 @@ amsterdam:
   colour: "#a1b92e"
   bandwidth: 50
   ipv4: 134.90.146.26
   colour: "#a1b92e"
   bandwidth: 50
   ipv4: 134.90.146.26

-  default: true
+  default: "xx"

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