X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/46b6613ef2c4c03cbd708d86bf395adc7f06d004..4166e6d35cf8c114805a3da2f8b39ad1f26de6df:/cookbooks/postgresql/recipes/default.rb

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index a0d9f0e90..d94b29a0e 100644
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -64,16 +64,25 @@ 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
+      variables :standby_mode => standby_mode,
+                :primary_conninfo => primary_conninfo,
+                :restore_command => restore_command,
+                :passwords => passwords
       notifies :reload, "service[postgresql]"
     end
   else