Update rubocop configuration for COP renames

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

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index 25fe9671da5e4e186293a2cf8a35df600c677358..b23c00f36bacacdc65ef03b4ec303e247ee56afc 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
 #
 # 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
 #
 #
 # 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,
 #
 # 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.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "osmosis"
 
 db_passwords = data_bag_item("db", "passwords")
 include_recipe "osmosis"
 
 db_passwords = data_bag_item("db", "passwords")


@@ -27,11 +28,11 @@ package "ruby"
 package "ruby-dev"
 package "ruby-libxml"
 
 package "ruby-dev"
 package "ruby-libxml"
 

-package "libpq-dev"
-gem_package "pg"
-

 package "make"
 package "gcc"
 package "make"
 package "gcc"

+package "libpq-dev"
+
+gem_package "pg"

 
 remote_directory "/opt/flush" do
   source "flush"
 
 remote_directory "/opt/flush" do
   source "flush"


@@ -69,6 +70,23 @@ template "/usr/local/bin/users-agreed" do
   mode 0o755
 end
 
   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"
 remote_directory "/store/planet/replication" do
   source "replication-cgi"
   owner "root"