Update for Postgres 9.3 support

[chef.git] / 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 01b796862cd1d7f208d2c3f923e2f317d70de201..28cdcaafb27794672f95481db66332b845c31993 100644 (file)
--- 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 -
 
@@ -85,6 +89,7 @@ hot_standby_feedback = <%= @settings[:hot_standby_feedback] || @defaults[:hot_st
 # - Planner Cost Constants -
 
 random_page_cost = <%= @settings[:random_page_cost] || @defaults[:random_page_cost] %>
+cpu_tuple_cost = <%= @settings[:cpu_tuple_cost] || @defaults[:cpu_tuple_cost] %>
 effective_cache_size = <%= @settings[:effective_cache_size] || @defaults[:effective_cache_size] %>
 
 #------------------------------------------------------------------------------