Bump planet-dump-ng version to v1.1.8, which includes a concurrency limit for disk...

[chef.git] / cookbooks / planet / recipes / replication.rb

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index 25fe9671da5e4e186293a2cf8a35df600c677358..f1be1d0d0b45fe8676d1c8b3ad37b5854b85b851 100644 (file)
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.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,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "accounts"
 include_recipe "osmosis"
 
 db_passwords = data_bag_item("db", "passwords")
@@ -27,11 +28,11 @@ package "ruby"
 package "ruby-dev"
 package "ruby-libxml"
 
-package "libpq-dev"
-gem_package "pg"
-
 package "make"
 package "gcc"
+package "libpq-dev"
+
+gem_package "pg"
 
 remote_directory "/opt/flush" do
   source "flush"
@@ -69,6 +70,23 @@ template "/usr/local/bin/users-agreed" do
   mode 0o755
 end
 
+template "/usr/local/bin/users-deleted" do
+  source "users-deleted.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+remote_directory "/store/planet/users_deleted" do
+  source "users_deleted"
+  owner "planet"
+  group "planet"
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o644
+end
+
 remote_directory "/store/planet/replication" do
   source "replication-cgi"
   owner "root"
@@ -109,6 +127,12 @@ directory "/etc/replication" do
   mode 0o755
 end
 
+directory "/var/run/lock/changeset-replication/" do
+  owner "planet"
+  group "planet"
+  mode 0o750
+end
+
 template "/etc/replication/auth.conf" do
   source "replication.auth.erb"
   user "root"