X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e65c3ec74865e377c215dacf142864fa7f36cec3..b36599d7d102e864b89c65986fa0945a931628cc:/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 157c103f0..2404f00ce 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
@@ -43,19 +43,19 @@ 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 (torrent)
%(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("""
@@ -70,7 +70,7 @@ print """
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.
-WARNING Download speeds are currently restricted to 4096 KB/s due to limited available capacity on our Internet connection.
Please use torrents or
a mirror if possible.
+WARNING Download speeds are currently restricted to 16 MB/s due to limited available capacity on our Internet connection.
Please use torrents or
a mirror if possible.
|
@@ -133,4 +133,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())
|