Move db-slave and nominatim-slave roles to public repository

[chef.git] / cookbooks / postgresql / recipes / default.rb

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 4cf4b0bda6347981f93dfb6517afb422541ee40e..d94b29a0eef075d3bdc6714090dc53f51f64f181 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -19,11 +19,6 @@
 
 package "postgresql-common"
 
-service "postgresql" do
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
-end
-
 node[:postgresql][:versions].each do |version|
   package "postgresql-#{version}"
   package "postgresql-client-#{version}"
@@ -39,7 +34,7 @@ node[:postgresql][:versions].each do |version|
     group "postgres"
     mode 0644
     variables :version => version, :defaults => defaults, :settings => settings
-    notifies :reload, resources(:service => "postgresql")
+    notifies :reload, "service[postgresql]"
   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do
@@ -49,7 +44,7 @@ node[:postgresql][:versions].each do |version|
     mode 0640
     variables :early_rules => settings[:early_authentication_rules] || defaults[:early_authentication_rules],
               :late_rules => settings[:late_authentication_rules] || defaults[:late_authentication_rules]
-    notifies :reload, resources(:service => "postgresql")
+    notifies :reload, "service[postgresql]"
   end
 
   template "/etc/postgresql/#{version}/main/pg_ident.conf" do
@@ -58,7 +53,7 @@ node[:postgresql][:versions].each do |version|
     group "postgres"
     mode 0640
     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
-    notifies :reload, resources(:service => "postgresql")
+    notifies :reload, "service[postgresql]"
   end
 
   link "/var/lib/postgresql/#{version}/main/server.crt" do
@@ -69,26 +64,40 @@ node[:postgresql][:versions].each do |version|
     to "/etc/ssl/private/ssl-cert-snakeoil.key"
   end
 
-  restore_command = settings[:restore_command] || defaults[:restore_command]
   standby_mode = settings[:standby_mode] || defaults[:standby_mode]
+  primary_conninfo = settings[:primary_conninfo] || defaults[:primary_conninfo]
+  restore_command = settings[:restore_command] || defaults[:restore_command]
 
   if restore_command || standby_mode == "on"
+    passwords = if primary_conninfo
+                  data_bag_item(primary_conninfo[:passwords][:bag],
+                                primary_conninfo[:passwords][:item])
+                end
+
     template "/var/lib/postgresql/#{version}/main/recovery.conf" do
       source "recovery.conf.erb"
       owner "postgres"
       group "postgres"
       mode 0640
-      variables :defaults => defaults, :settings => settings
-      notifies :reload, resources(:service => "postgresql")
+      variables :standby_mode => standby_mode,
+                :primary_conninfo => primary_conninfo,
+                :restore_command => restore_command,
+                :passwords => passwords
+      notifies :reload, "service[postgresql]"
     end
   else
     template "/var/lib/postgresql/#{version}/main/recovery.conf" do
       action :delete
-      notifies :reload, resources(:service => "postgresql")
+      notifies :reload, "service[postgresql]"
     end
   end
 end
 
+service "postgresql" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
+end
+
 ohai_plugin "postgresql" do
   template "ohai.rb.erb"
 end
@@ -98,7 +107,7 @@ package "libdbd-pg-perl"
 
 clusters = node[:postgresql][:clusters] || []
 
-clusters.each do |name,details|
+clusters.each do |name, details|
   suffix = name.tr("/", ":")
 
   munin_plugin "postgres_bgwriter_#{suffix}" do
@@ -131,11 +140,11 @@ clusters.each do |name,details|
     conf_variables :port => details[:port]
   end
 
-  if File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf")
-    munin_plugin "postgres_replication_#{suffix}" do
-      target "postgres_replication"
-      conf "munin.erb"
-      conf_variables :port => details[:port]
-    end
+  next unless File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf")
+
+  munin_plugin "postgres_replication_#{suffix}" do
+    target "postgres_replication"
+    conf "munin.erb"
+    conf_variables :port => details[:port]
   end
 end