X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/5fa5a79ec9f93b9be432f21854355cbc2cef2eab..b767bc1e4b784c6613ff7ad009accdcd33263309:/cookbooks/postgresql/templates/default/postgresql.conf.erb diff --git a/cookbooks/postgresql/templates/default/postgresql.conf.erb b/cookbooks/postgresql/templates/default/postgresql.conf.erb index 42e6f8876..754131e73 100644 --- a/cookbooks/postgresql/templates/default/postgresql.conf.erb +++ b/cookbooks/postgresql/templates/default/postgresql.conf.erb @@ -20,7 +20,11 @@ listen_addresses = '<%= @settings[:listen_addresses] || @defaults[:listen_addres <% end -%> port = <%= @settings[:port] || @defaults[:port] %> max_connections = <%= @settings[:max_connections] || @defaults[:max_connections] %> +<% if @version.to_f >= 9.3 %> +unix_socket_directories = '/var/run/postgresql' +<% else -%> unix_socket_directory = '/var/run/postgresql' +<% end -%> # - Security and Authentication - @@ -54,7 +58,9 @@ commit_delay = <%= @settings[:commit_delay] || @defaults[:commit_delay] %> # - Checkpoints - +<% if @version.to_f < 9.5 %> checkpoint_segments = <%= @settings[:checkpoint_segments] || @defaults[:checkpoint_segments] %> +<% end -%> checkpoint_timeout = <%= @settings[:checkpoint_timeout] || @defaults[:checkpoint_timeout] %> checkpoint_completion_target = <%= @settings[:checkpoint_completion_target] || @defaults[:checkpoint_completion_target] %>