Handle interfaces with no address

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

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index 770d52c7c5362a638d68cfe907ebaf9ec171ee60..b23c00f36bacacdc65ef03b4ec303e247ee56afc 100644 (file)
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -1,8 +1,8 @@
 #
 #

-# 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -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"


@@ -76,6 +77,16 @@ template "/usr/local/bin/users-deleted" do
   mode 0o755
 end
 
   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"