From c539edca301fde6201f8d7f53e5310f1219789f1 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 2 Dec 2020 19:28:14 +0000 Subject: [PATCH] Disable SSL for postgres 9.1 on errol --- cookbooks/postgresql/attributes/default.rb | 1 + cookbooks/postgresql/templates/default/postgresql.conf.erb | 2 +- roles/dev.rb | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cookbooks/postgresql/attributes/default.rb b/cookbooks/postgresql/attributes/default.rb index 2d9fc1079..c7eeecff8 100644 --- a/cookbooks/postgresql/attributes/default.rb +++ b/cookbooks/postgresql/attributes/default.rb @@ -2,6 +2,7 @@ default[:postgresql][:versions] = [] default[:postgresql][:clusters] = {} default[:postgresql][:settings][:defaults][:port] = "5432" default[:postgresql][:settings][:defaults][:max_connections] = "100" +default[:postgresql][:settings][:defaults][:ssl] = "true" default[:postgresql][:settings][:defaults][:shared_buffers] = "32MB" default[:postgresql][:settings][:defaults][:temp_buffers] = "8MB" default[:postgresql][:settings][:defaults][:work_mem] = "1MB" diff --git a/cookbooks/postgresql/templates/default/postgresql.conf.erb b/cookbooks/postgresql/templates/default/postgresql.conf.erb index 3c84ec994..c5773f106 100644 --- a/cookbooks/postgresql/templates/default/postgresql.conf.erb +++ b/cookbooks/postgresql/templates/default/postgresql.conf.erb @@ -28,7 +28,7 @@ unix_socket_directory = '/var/run/postgresql' # - Security and Authentication - -ssl = true +ssl = <%= @settings[:ssl] %> ssl_renegotiation_limit = 0 #------------------------------------------------------------------------------ diff --git a/roles/dev.rb b/roles/dev.rb index 565d4b70c..672c5e022 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -141,7 +141,8 @@ default_attributes( :effective_cache_size => "4GB" }, "9.1" => { - :port => "5433" + :port => "5433", + :ssl => "false" }, "12" => { :port => "5432", -- 2.43.2