Add explanatory header for full-experimental CC BY-SA planets.
authorMatt Amos <zerebubuth@gmail.com>
Wed, 22 Nov 2017 10:02:07 +0000 (10:02 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Wed, 22 Nov 2017 10:02:07 +0000 (10:02 +0000)
Thanks to @pnorman for pointing out the difference between them. Since it confused me, seems worth adding a little comment at the top to say what each one is (and why the earlier one says "final").

cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi [new file with mode: 0644]
cookbooks/planet/recipes/default.rb

diff --git a/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi b/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi
new file mode 100644 (file)
index 0000000..2524737
--- /dev/null
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+print """
+<html>
+ <head>
+  <title>OpenStreetMap historical CC BY-SA 2.0 licensed data</title>
+  <link href="/style.css" rel="stylesheet" type="text/css">
+ </head>
+ <body>
+<img id="logo" src="/logo.png" alt="OSM logo" width="128" height="128">
+<h1>planet.openstreetmap.org - CC BY-SA experimental history files.</h1>
+<p>These files are the last experimental history files produced under the CC BY-SA license. More recent data under the ODbL license is <a href="/planet/full-history/">available here</a>.<p>
+<p>The <tt>full-planet-120401-final.osm.bz2</tt> file is the last dump of data before <a href="https://blog.osmfoundation.org/2012/07/26/automated-redactions-complete/">redactions were run to remove data which could not be released under ODbL</a>. The <tt>full-planet-120601-1150.osm.bz2</tt> 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.</p>
+<p>Licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC BY-SA 2.0</a></p>
+<p>&nbsp;</p>
+"""
index 5d4e063..b84c5ba 100644 (file)
@@ -61,6 +61,16 @@ remote_directory node[:planet][:dump][:xml_history_directory] do
   files_mode 0o755
 end
 
+remote_directory "/store/planet/cc-by-sa/full-experimental" do
+  source "ccbysa_history_cgi"
+  owner "www-data"
+  group "planet"
+  mode 0o775
+  files_owner "root"
+  files_group "root"
+  files_mode 0o755
+end
+
 [:xml_directory, :xml_history_directory,
  :pbf_directory, :pbf_history_directory].each do |dir|
   directory node[:planet][:dump][dir] do