From 6da11d5333d3a636b7ee9861838e24ae845a3694 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 4 Jul 2013 00:40:14 +0100 Subject: [PATCH] Manage the replication directory --- cookbooks/osmosis/recipes/default.rb | 3 ++ .../default/bin/apache-latest-planet-filename | 0 .../default/bin/planet-mirror-redirect-update | 0 cookbooks/planet/files/default/bin/planet2pbf | 0 cookbooks/planet/files/default/cgi/HEADER.cgi | 0 .../replication-bin/replicate-changesets} | 0 .../files/default/replication-cgi/HEADER.cgi | 14 +++++++ cookbooks/planet/recipes/replication.rb | 41 ++++++++++++++++++- 8 files changed, 56 insertions(+), 2 deletions(-) mode change 100755 => 100644 cookbooks/planet/files/default/bin/apache-latest-planet-filename mode change 100755 => 100644 cookbooks/planet/files/default/bin/planet-mirror-redirect-update mode change 100755 => 100644 cookbooks/planet/files/default/bin/planet2pbf mode change 100755 => 100644 cookbooks/planet/files/default/cgi/HEADER.cgi rename cookbooks/planet/{templates/default/changesets.bin.erb => files/default/replication-bin/replicate-changesets} (100%) create mode 100644 cookbooks/planet/files/default/replication-cgi/HEADER.cgi diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb index 42679ac3f..7532cd7ac 100644 --- a/cookbooks/osmosis/recipes/default.rb +++ b/cookbooks/osmosis/recipes/default.rb @@ -19,6 +19,9 @@ include_recipe "chef" +package "unzip" +package "openjdk-6-jre" + osmosis_package = "osmosis-#{node[:osmosis][:version]}.zip" osmosis_directory = "/opt/osmosis-#{node[:osmosis][:version]}" diff --git a/cookbooks/planet/files/default/bin/apache-latest-planet-filename b/cookbooks/planet/files/default/bin/apache-latest-planet-filename old mode 100755 new mode 100644 diff --git a/cookbooks/planet/files/default/bin/planet-mirror-redirect-update b/cookbooks/planet/files/default/bin/planet-mirror-redirect-update old mode 100755 new mode 100644 diff --git a/cookbooks/planet/files/default/bin/planet2pbf b/cookbooks/planet/files/default/bin/planet2pbf old mode 100755 new mode 100644 diff --git a/cookbooks/planet/files/default/cgi/HEADER.cgi b/cookbooks/planet/files/default/cgi/HEADER.cgi old mode 100755 new mode 100644 diff --git a/cookbooks/planet/templates/default/changesets.bin.erb b/cookbooks/planet/files/default/replication-bin/replicate-changesets similarity index 100% rename from cookbooks/planet/templates/default/changesets.bin.erb rename to cookbooks/planet/files/default/replication-bin/replicate-changesets diff --git a/cookbooks/planet/files/default/replication-cgi/HEADER.cgi b/cookbooks/planet/files/default/replication-cgi/HEADER.cgi new file mode 100644 index 000000000..5432bd9f4 --- /dev/null +++ b/cookbooks/planet/files/default/replication-cgi/HEADER.cgi @@ -0,0 +1,14 @@ +#!/usr/bin/env python + +print """ + + + OpenStreetMap replication diffs + + + +

planet.openstreetmap.org - replication diffs

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

+""" diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb index 027aba96b..f1d06b5e1 100644 --- a/cookbooks/planet/recipes/replication.rb +++ b/cookbooks/planet/recipes/replication.rb @@ -26,11 +26,48 @@ package "ruby-libxml" gem_package "pg" -template "/usr/local/bin/replicate-changesets" do - source "changesets.bin.erb" +remote_directory "/usr/local/bin" do + source "replication-bin" owner "root" group "root" mode 0755 + files_owner "root" + files_group "root" + files_mode 0755 +end + +remote_directory "/store/planet/replication" do + source "replication-cgi" + owner "root" + group "root" + mode 0755 + files_owner "root" + files_group "root" + files_mode 0755 +end + +directory "/store/planet/replication/changesets" do + owner "planet" + group "planet" + mode 0755 +end + +directory "/store/planet/replication/day" do + owner "planet" + group "planet" + mode 0755 +end + +directory "/store/planet/replication/hour" do + owner "planet" + group "planet" + mode 0755 +end + +directory "/store/planet/replication/minute" do + owner "planet" + group "planet" + mode 0755 end directory "/etc/replication" do -- 2.43.2