X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..614474a50b36944856024c28d28530c3f61755ef:/cookbooks/postgresql/templates/default/recovery.conf.erb diff --git a/cookbooks/postgresql/templates/default/recovery.conf.erb b/cookbooks/postgresql/templates/default/recovery.conf.erb index f7628906c..00f6eab9d 100644 --- a/cookbooks/postgresql/templates/default/recovery.conf.erb +++ b/cookbooks/postgresql/templates/default/recovery.conf.erb @@ -1,9 +1,9 @@ # DO NOT EDIT - This file is being maintained by Chef -standby_mode = <%= @settings[:standby_mode] || @defaults[:standby_mode] %> -<% if @settings[:primary_conninfo] || @defaults[:primary_conninfo] -%> -primary_conninfo = '<%= @settings[:primary_conninfo] || @defaults[:primary_conninfo] %>' +standby_mode = <%= @standby_mode %> +<% if @primary_conninfo -%> +primary_conninfo = 'host=<%= @primary_conninfo[:host] %> port=<%= @primary_conninfo[:port] %> user=<%= @primary_conninfo[:user] %> password=<%= @passwords[@primary_conninfo[:user]] %>' <% end -%> -<% if @settings[:restore_command] || @defaults[:restore_command] -%> -restore_command = '<%= @settings[:restore_command] || @defaults[:restore_command] %>' +<% if @restore_command -%> +restore_command = '<%= @restore_command %>' <% end -%>