Merge branch 'COOK-1224'

sous-chefs · Jun 13, 2012 · 4e91b9c · 4e91b9c
2 parents 9eb99ac + b28a7ea
commit 4e91b9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -20,10 +20,13 @@
 case platform
 when "debian"
 
-  if platform_version.to_f == 5.0
+  case
+  when platform_version.to_f <= 5.0
     default[:postgresql][:version] = "8.3"
-  elsif platform_version =~ /squeeze/
+  when platform_version.to_f == 6.0
     default[:postgresql][:version] = "8.4"
+  else
+    default[:postgresql][:version] = "9.1"
   end
 
   set[:postgresql][:dir] = "/etc/postgresql/#{node[:postgresql][:version]}/main"

diff --git a/recipes/server_debian.rb b/recipes/server_debian.rb
@@ -41,10 +41,8 @@
     end
   when "debian"
     case
-    when platform_version.to_f <= 5.0
+    when node['platform_version'].to_f <= 5.0
       service_name "postgresql-#{node['postgresql']['version']}"
-    when platform_version =~ /squeeze/
-      service_name "postgresql"
     else
       service_name "postgresql"
     end