Only install passenger-common for passenger 3

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

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index ac0009aa8b1cf0486867e6a82b1d0d1bd75dc736..6e3b6bc1e79f6aa40bd1d0cd4bd443dc6718fda2 100644 (file)
--- 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")
 
 
 db_passwords = data_bag_item("db", "passwords")
 

+package "postgresql-client"
+

 package "ruby"
 package "rubygems"
 package "ruby-libxml"
 
 package "ruby"
 package "rubygems"
 package "ruby-libxml"
 

+package "libpq-dev"

 gem_package "pg"
 
 remote_directory "/usr/local/bin" do
 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
 
   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"
 directory "/var/lib/replication" do
   owner "planet"
   group "planet"