X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9bb39d8d9dfa583ef2d9218ed8b1f72d5deaa7fb..0d4fb990b2e7c12719d199695e0dea0fdff75ac1:/cookbooks/planet/recipes/replication.rb?ds=sidebyside

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index ac0009aa8..1ae670bbb 100644
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -21,10 +21,13 @@ include_recipe "osmosis"
 
 db_passwords = data_bag_item("db", "passwords")
 
+package "postgresql-client"
+
 package "ruby"
-package "rubygems"
+package "ruby-dev"
 package "ruby-libxml"
 
+package "libpq-dev"
 gem_package "pg"
 
 remote_directory "/usr/local/bin" do
@@ -93,6 +96,14 @@ template "/etc/replication/changesets.conf" do
   variables :password => db_passwords["planetdiff"]
 end
 
+template "/etc/replication/users-agreed.conf" do
+  source "users-agreed.conf.erb"
+  user "planet"
+  group "planet"
+  mode 0600
+  variables :password => db_passwords["planetdiff"]
+end
+
 directory "/var/lib/replication" do
   owner "planet"
   group "planet"
@@ -154,7 +165,7 @@ directory "/var/log/replication" do
   mode 0755
 end
 
-[ "streaming-replicator", "streaming-server" ].each do |name|
+["streaming-replicator", "streaming-server"].each do |name|
   template "/etc/init.d/#{name}" do
     source "streaming.init.erb"
     owner "root"
@@ -164,7 +175,7 @@ end
   end
 
   service name do
-    action [ :enable, :start ]
+    action [:enable, :start]
     supports :restart => true, :status => true
     subscribes :restart, "template[/etc/init.d/#{name}]"
   end