X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0dc5b202333dd649872fd80468ed9f17e862e8cd..5310624b7dd65e3d65b5faf7225f914bdbc1e76a:/cookbooks/planet/files/default/cgi/HEADER.cgi diff --git a/cookbooks/planet/files/default/cgi/HEADER.cgi b/cookbooks/planet/files/default/cgi/HEADER.cgi index da7004ca1..6b2760293 100644 --- a/cookbooks/planet/files/default/cgi/HEADER.cgi +++ b/cookbooks/planet/files/default/cgi/HEADER.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from time import time from os import stat, environ @@ -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: @@ -43,33 +43,33 @@ def nice_time(time): return '%d months' % (time / 2592000.) -def file_info(file, name): +def file_info(file, rss_file, name): + torrent_file = file + '.torrent' size = nice_size(file) hash = search(r'\w{32}', open(file+'.md5', 'r').read()).group(0) date = nice_time(time() - stat(file).st_mtime) - return '%(name)s
%(size)s, created %(date)s ago.
md5: %(hash)s.' % locals() + return '%(name)s (torrent) (RSS)
%(size)s, created %(date)s ago.
md5: %(hash)s.' % locals() -planet_link = file_info('planet/planet-latest.osm.bz2', 'Latest Weekly Planet XML File') -changesets_link = file_info('planet/changesets-latest.osm.bz2', 'Latest Weekly Changesets') -planet_pbf_link = file_info('pbf/planet-latest.osm.pbf', 'Latest Weekly Planet PBF File') +planet_link = file_info('planet/planet-latest.osm.bz2', 'planet/planet-bz2-rss.xml', 'Latest Weekly Planet XML File') +changesets_link = file_info('planet/changesets-latest.osm.bz2', 'planet/changesets-bz2-rss.xml', 'Latest Weekly Changesets') +planet_pbf_link = file_info('pbf/planet-latest.osm.pbf', 'pbf/planet-pbf-rss.xml', 'Latest Weekly Planet PBF File') -print """ +print(""" Index of / - + - +

Planet OSM

The files found here are regularly-updated, complete copies of the OpenStreetMap.org database, and those published before the 12 September 2012 are distributed under a Creative Commons Attribution-ShareAlike 2.0 license, those published after are Open Data Commons Open Database License 1.0 licensed. For more information, see the project wiki.

-
@@ -101,8 +101,8 @@ database, and those published before the 12 September 2012 are distributed under

- 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.

@@ -113,9 +113,8 @@ database, and those published before the 12 September 2012 are distributed under is a tool for importing the data into a Postgis database for rendering maps.

- Processed coastline data - derived from OSM data is also needed for rendering usable maps, and can be found in a - single shapefile (360MB). + Processed coastline data + derived from OSM data is also needed for rendering usable maps.

@@ -133,4 +132,4 @@ database, and those published before the 12 September 2012 are distributed under

If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the OpenStreetMap Data Working Group.

-""" % locals() +""" % locals())