X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cd507bd2203f95ea8af4faf6c3128bd6df2b4666..0aaea8096fcdd565f0f1990a84ad68e9aeb90113:/cookbooks/planet/recipes/dump.rb?ds=inline

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 02f3ae350..94fd04e93 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,
@@ -20,40 +20,44 @@
 node.default[:incron][:planetdump] = {
   :user => "www-data",
   :path => "/store/backup",
-  :events => [ "IN_CREATE", "IN_MOVED_TO" ],
+  :events => %w[IN_CREATE IN_MOVED_TO],
   :command => "/usr/local/bin/planetdump $#"
 }
 
 include_recipe "git"
 include_recipe "incron"
 
-package "gcc"
-package "make"
-package "autoconf"
-package "automake"
-package "libxml2-dev"
-package "libboost-dev"
-package "libboost-program-options-dev"
-package "libboost-date-time-dev"
-package "libboost-filesystem-dev"
-package "libboost-thread-dev"
-package "libboost-iostreams-dev"
-package "libosmpbf-dev"
-package "libleveldb-dev"
-package "libsnappy-dev"
-package "libprotobuf-dev"
-package "osmpbf-bin"
+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/planet-dump-ng" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 git "/opt/planet-dump-ng" do
   action :sync
-  repository "git://github.com/zerebubuth/planet-dump-ng.git"
-  revision "master"
+  repository "https://github.com/zerebubuth/planet-dump-ng.git"
+  revision "v1.1.6"
+  depth 1
   user "root"
   group "root"
 end
@@ -69,7 +73,7 @@ end
 
 execute "/opt/planet-dump-ng/configure" do
   action :nothing
-  command "./configure --with-leveldb=/usr"
+  command "./configure"
   cwd "/opt/planet-dump-ng"
   user "root"
   group "root"
@@ -88,12 +92,22 @@ end
 directory "/store/planetdump" do
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
+  recursive true
 end
 
-template "/usr/local/bin/planetdump" do
-  source "planetdump.erb"
+%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/planet-dump-mirror" do
+  source "planet-dump-mirror-cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o644
 end