Disable SSL for postgres 9.1 on errol

diff --git a/cookbooks/postgresql/attributes/default.rb b/cookbooks/postgresql/attributes/default.rb
index 2d9fc10797f1a9e1e5c23dd1ebc27a60379a52cb..c7eeecff8215e5987ea2f91f4beddd160b786c40 100644 (file)
--- 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 3c84ec994081343b1085d421228ce726e4bf5ae2..c5773f106a4a0995c90163cb33924e062b85f22b 100644 (file)
--- 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 565d4b70cc66d12b03a3ae1bf82174a51e0c9d1c..672c5e022a61d65b951e3a693b7fdb46e546b217 100644 (file)
--- 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",