[COOK-2954] Support Installing non-standard versions on CentOS 6

Signed-off-by: Sean OMeara <someara@opscode.com>
sous-chefs · Nov 21, 2013 · b0da459 · b0da459
1 parent f9c4d5a
commit b0da459
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -101,7 +101,7 @@
   default['postgresql']['version'] = "8.4"
   default['postgresql']['dir'] = "/var/lib/pgsql/data"
 
-  if node['platform_version'].to_f >= 6.0
+  if node['platform_version'].to_f >= 6.0 && node['postgresql']['version'] == '8.4'
     default['postgresql']['client']['packages'] = %w{postgresql-devel}
     default['postgresql']['server']['packages'] = %w{postgresql-server}
     default['postgresql']['contrib']['packages'] = %w{postgresql-contrib}
@@ -110,7 +110,14 @@
     default['postgresql']['server']['packages'] = ["postgresql#{node['postgresql']['version'].split('.').join}-server"]
     default['postgresql']['contrib']['packages'] = ["postgresql#{node['postgresql']['version'].split('.').join}-contrib"]
   end
-  default['postgresql']['server']['service_name'] = "postgresql"
+
+  if node['platform_version'].to_f >= 6.0 && node['postgresql']['version'] != '8.4'
+     default['postgresql']['dir'] = "/var/lib/pgsql/#{node['postgresql']['version']}/data"
+     default['postgresql']['server']['service_name'] = "postgresql-#{node['postgresql']['version']}"
+  else
+    default['postgresql']['dir'] = "/var/lib/pgsql/data"
+    default['postgresql']['server']['service_name'] = "postgresql"
+  end
 
 when "suse"