Don't try and tune nr_requests on jakelong

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

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index c2055e4ebc1099f6c208d4d15a0ca3a831ebbb30..fef4e017ed51235b09ff1228b2e9a12a578649db 100644 (file)
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -21,8 +21,10 @@ 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"
@@ -94,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"
@@ -136,11 +146,17 @@ link "/var/lib/replication/day/data" do
   to "/store/planet/replication/day"
 end
 
-template "/etc/cron.d/replication" do
-  source "replication.cron.erb"
-  owner "root"
-  group "root"
-  mode 0644
+if node[:planet][:replication] == "enabled"
+  template "/etc/cron.d/replication" do
+    source "replication.cron.erb"
+    owner "root"
+    group "root"
+    mode 0644
+  end
+else
+  file "/etc/cron.d/replication" do
+    action :delete
+  end
 end
 
 directory "/var/lib/replication/streaming" do
@@ -155,7 +171,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,9 +180,16 @@ end
     variables :service => name
   end
 
-  service name do
-    action [ :enable, :start ]
-    supports :restart => true, :status => true
-    subscribes :restart, "template[/etc/init.d/#{name}]"
+  if node[:planet][:replication] == "enabled"
+    service name do
+      action [:enable, :start]
+      supports :restart => true, :status => true
+      subscribes :restart, "template[/etc/init.d/#{name}]"
+    end
+  else
+    service name do
+      action [:disable, :stop]
+      supports :restart => true, :status => true
+    end
   end
 end