From 1c23f91baf21cbc86e5ac7bfd6fed183c36b7205 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 22 Feb 2020 18:56:57 +0000 Subject: [PATCH] planet: Resolve header links so works on mirrors --- .../default/ccbysa_history_cgi/HEADER.cgi | 4 ++-- cookbooks/planet/files/default/cgi/HEADER.cgi | 4 ++-- .../files/default/history_cgi/HEADER.cgi | 20 +++++++++---------- .../planet/files/default/html/robots.txt | 3 +-- .../files/default/replication-cgi/HEADER.cgi | 4 ++-- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi b/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi index 252473797..6d1810e63 100644 --- a/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi +++ b/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi @@ -4,10 +4,10 @@ print """ OpenStreetMap historical CC BY-SA 2.0 licensed data - + -

planet.openstreetmap.org - CC BY-SA experimental history files.

These files are the last experimental history files produced under the CC BY-SA license. More recent data under the ODbL license is available here.

The full-planet-120401-final.osm.bz2 file is the last dump of data before redactions were run to remove data which could not be released under ODbL. The full-planet-120601-1150.osm.bz2 is the last dump of data available under CC BY-SA, but after the redactions were run. This means it may have less data in some areas, although many redactions were quickly re-mapped.

diff --git a/cookbooks/planet/files/default/cgi/HEADER.cgi b/cookbooks/planet/files/default/cgi/HEADER.cgi index 6b1f7ac0c..0ce17f64a 100644 --- a/cookbooks/planet/files/default/cgi/HEADER.cgi +++ b/cookbooks/planet/files/default/cgi/HEADER.cgi @@ -59,10 +59,10 @@ print """ Index of / - + -

Planet OSM

diff --git a/cookbooks/planet/files/default/history_cgi/HEADER.cgi b/cookbooks/planet/files/default/history_cgi/HEADER.cgi index 51ac84581..460acd319 100755 --- a/cookbooks/planet/files/default/history_cgi/HEADER.cgi +++ b/cookbooks/planet/files/default/history_cgi/HEADER.cgi @@ -10,7 +10,7 @@ def nice_size(file): MB = 1024. * KB GB = 1024. * MB TB = 1024. * GB - + if size < KB: size, suffix = size, '' elif size < MB: @@ -21,7 +21,7 @@ def nice_size(file): size, suffix = size/GB, 'GB' else: size, suffix = size/TB, 'TB' - + if size < 10: return '%.1f %s' % (round(size,1), suffix) else: @@ -58,16 +58,16 @@ print """ Index of /planet/full-history - + - +

Planet OSM

The files found here are complete copies of the OpenStreetMap.org -database, including editing history. These are published under an -Open Data Commons Open Database License 1.0 licensed. For more +database, including editing history. These are published under an +Open Data Commons Open Database License 1.0 licensed. For more information, see the project wiki.

@@ -94,13 +94,13 @@ information, see t

- You are granted permission to use OpenStreetMap data by - the OpenStreetMap License, which also describes + You are granted permission to use OpenStreetMap data by + the OpenStreetMap License, which also describes your obligations.

You can process the file - or extracts with a variety of tools, although some tools for processing OSM data will + or extracts with a variety of tools, although some tools for processing OSM data will only work on 'current' planets and will not process a 'history' planet available here.

@@ -108,7 +108,7 @@ information, see t

The complete history planet is extremely large, so you may prefer to use one of the available extracts - (individual countries or states) from third parties. + (individual countries or states) from third parties.

diff --git a/cookbooks/planet/files/default/html/robots.txt b/cookbooks/planet/files/default/html/robots.txt index 3f3940cbc..806b5ec18 100644 --- a/cookbooks/planet/files/default/html/robots.txt +++ b/cookbooks/planet/files/default/html/robots.txt @@ -1,8 +1,7 @@ -#No bz2 chomping bots please +# No bz2 chomping bots please User-agent: wget Allow: / User-agent: * Disallow: / - diff --git a/cookbooks/planet/files/default/replication-cgi/HEADER.cgi b/cookbooks/planet/files/default/replication-cgi/HEADER.cgi index edde59d27..269ce0f72 100644 --- a/cookbooks/planet/files/default/replication-cgi/HEADER.cgi +++ b/cookbooks/planet/files/default/replication-cgi/HEADER.cgi @@ -4,10 +4,10 @@ print """ OpenStreetMap replication diffs - + -

planet.openstreetmap.org - replication diffs

OpenStreetMap is open data, licensed under the Open Data Commons Open Database License (ODbL)

-- 2.39.5