Use boolean values for ssl. Remove duplicated code.

sous-chefs · Nov 9, 2012 · b223d2a · b223d2a
1 parent 1e26521
commit b223d2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/recipes/server.rb b/recipes/server.rb
@@ -27,10 +27,11 @@
 node.set_unless['postgresql']['password']['postgres'] = secure_password
 node.save unless Chef::Config[:solo]
 
-if node['postgresql']['version'].to_f <= 8.3
-  node.default['postgresql']['ssl'] = "off"
-else
-  node.default['postgresql']['ssl'] = "true"
+case node[:postgresql][:version]
+when "8.3"
+  node.default[:postgresql][:ssl] = false
+when "8.4"
+  node.default[:postgresql][:ssl] = true
 end
 
 # Include the right "family" recipe for installing the server

diff --git a/recipes/server_debian.rb b/recipes/server_debian.rb
@@ -21,13 +21,6 @@
 
 include_recipe "postgresql::client"
 
-
-if node['postgresql']['version'].to_f <= 8.3
-  node.default['postgresql']['ssl'] = "off"
-else
-  node.default['postgresql']['ssl'] = "true"
-end
-
 node['postgresql']['server']['packages'].each do |pg_pack|
   package pg_pack do
     action :install