X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/932f7a837e84c5c29fd8429a574dd7aea5314b0a..aa1f26f044f0f2238f1cb0fdf8ec0879bc44d639:/cookbooks/planet/recipes/dump.rb

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 197ed10b4..a5e9a5fff 100644
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: planet
+# Cookbook:: planet
 # Recipe:: dump
 #
-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,48 +17,95 @@
 # limitations under the License.
 #
 
-include_recipe "git"
+node.default[:incron][:planetdump] = {
+  :user => "www-data",
+  :path => "/store/backup",
+  :events => %w[IN_CREATE IN_MOVED_TO],
+  :command => "/usr/local/bin/planetdump $#"
+}
 
-db_passwords = data_bag_item("db", "passwords")
+include_recipe "git"
+include_recipe "incron"
 
-package "gcc"
-package "make"
-package "libpqxx3-dev"
+package %w[
+  gcc
+  make
+  autoconf
+  automake
+  libxml2-dev
+  libboost-dev
+  libboost-program-options-dev
+  libboost-date-time-dev
+  libboost-filesystem-dev
+  libboost-thread-dev
+  libboost-iostreams-dev
+  libosmpbf-dev
+  libprotobuf-dev
+  osmpbf-bin
+  pbzip2
+  php-cli
+  php-curl
+]
 
-directory "/opt/planetdump" do
+directory "/opt/planet-dump-ng" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
-git "/opt/planetdump" do
+git "/opt/planet-dump-ng" do
   action :sync
-  repository "git://git.openstreetmap.org/planetdump.git"
-  revision "live"
+  repository "git://github.com/zerebubuth/planet-dump-ng.git"
+  revision "v1.1.6"
   user "root"
   group "root"
 end
 
-execute "/opt/planetdump/Makefile" do
+execute "/opt/planet-dump-ng/autogen.sh" do
   action :nothing
-  command "make planet06_pg"
-  cwd "/opt/planetdump"
+  command "./autogen.sh"
+  cwd "/opt/planet-dump-ng"
   user "root"
   group "root"
-  subscribes :run, "git[/opt/planetdump]"
+  subscribes :run, "git[/opt/planet-dump-ng]"
 end
 
-template "/usr/local/bin/planetdump" do
-  source "planetdump.erb"
-  owner "root"
+execute "/opt/planet-dump-ng/configure" do
+  action :nothing
+  command "./configure"
+  cwd "/opt/planet-dump-ng"
+  user "root"
+  group "root"
+  subscribes :run, "execute[/opt/planet-dump-ng/autogen.sh]"
+end
+
+execute "/opt/planet-dump-ng/Makefile" do
+  action :nothing
+  command "make"
+  cwd "/opt/planet-dump-ng"
+  user "root"
   group "root"
-  mode 0755
-  variables :password => db_passwords["planetdump"]
+  subscribes :run, "execute[/opt/planet-dump-ng/configure]"
+end
+
+directory "/store/planetdump" do
+  owner "www-data"
+  group "www-data"
+  mode 0o755
+end
+
+%w[planetdump planet-mirror-redirect-update].each do |program|
+  template "/usr/local/bin/#{program}" do
+    source "#{program}.erb"
+    owner "root"
+    group "root"
+    mode 0o755
+  end
 end
 
-template "/etc/cron.d/planetdump" do
-  source "planetdump.cron.erb"
+template "/etc/cron.d/planet-dump-mirror" do
+  source "planet-dump-mirror-cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end