Merge branch 'COOK-1844'

README.md

@@ -18,7 +18,7 @@ Tested on:
 * Ubuntu 10.04, 11.10, 12.04
 * Red Hat 6.1, Scientific 6.1, CentOS 6.3
 
-## Cookboooks
+## Cookbooks
 
 Requires Opscode's `openssl` cookbook for secure password generation.
 

attributes/default.rb

@@ -30,6 +30,13 @@
   end
 
   default['postgresql']['dir'] = "/etc/postgresql/#{node['postgresql']['version']}/main"
+  case
+  when node['platform_version'].to_f <= 5.0
+    default['postgresql']['server']['service_name'] = "postgresql-#{node['postgresql']['version']}"
+  else
+    default['postgresql']['server']['service_name'] = "postgresql"
+  end
+
   default['postgresql']['client']['packages'] = %w{postgresql-client libpq-dev}
   default['postgresql']['server']['packages'] = %w{postgresql}
 
@@ -45,6 +52,13 @@
   end
 
   default['postgresql']['dir'] = "/etc/postgresql/#{node['postgresql']['version']}/main"
+  case
+  when node['platform_version'].to_f <= 10.04
+    default['postgresql']['server']['service_name'] = "postgresql-#{node['postgresql']['version']}"
+  else
+    default['postgresql']['server']['service_name'] = "postgresql"
+  end
+
   default['postgresql']['client']['packages'] = %w{postgresql-client libpq-dev}
   default['postgresql']['server']['packages'] = %w{postgresql}
 
@@ -59,13 +73,15 @@
   default['postgresql']['dir'] = "/var/lib/pgsql/data"
   default['postgresql']['client']['packages'] = %w{postgresql-devel}
   default['postgresql']['server']['packages'] = %w{postgresql-server}
+  default['postgresql']['server']['service_name'] = "postgresql"
 
 when "amazon"
 
   default['postgresql']['version'] = "8.4"
   default['postgresql']['dir'] = "/var/lib/pgsql/data"
   default['postgresql']['client']['packages'] = %w{postgresql-devel}
   default['postgresql']['server']['packages'] = %w{postgresql-server}
+  default['postgresql']['server']['service_name'] = "postgresql"
 
 when "redhat", "centos", "scientific", "oracle"
 
@@ -79,6 +95,7 @@
     default['postgresql']['client']['packages'] = ["postgresql#{node['postgresql']['version'].split('.').join}-devel"]
     default['postgresql']['server']['packages'] = ["postgresql#{node['postgresql']['version'].split('.').join}-server"]
   end
+  default['postgresql']['server']['service_name'] = "postgresql"
 
 when "suse"
 
@@ -91,12 +108,14 @@
   default['postgresql']['dir'] = "/var/lib/pgsql/data"
   default['postgresql']['client']['packages'] = %w{postgresql-client libpq-dev}
   default['postgresql']['server']['packages'] = %w{postgresql-server}
+  default['postgresql']['server']['service_name'] = "postgresql"
 
 else
   default['postgresql']['version'] = "8.4"
   default['postgresql']['dir']         = "/etc/postgresql/#{node['postgresql']['version']}/main"
   default['postgresql']['client']['packages'] = ["postgresql"]
   default['postgresql']['server']['packages'] = ["postgresql"]
+  default['postgresql']['server']['service_name'] = "postgresql"
 end
 
 # These defaults have disparity between which postgresql configuration

recipes/server.rb

@@ -1,4 +1,4 @@
-#/postgresql.conf.
+#
 # Cookbook Name:: postgresql
 # Recipe:: server
 #

recipes/server_debian.rb

@@ -28,22 +28,7 @@
 end
 
 service "postgresql" do
-  case node['platform']
-  when "ubuntu"
-    case
-    when node['platform_version'].to_f <= 10.04
-      service_name "postgresql-#{node['postgresql']['version']}"
-    else
-      service_name "postgresql"
-    end
-  when "debian"
-    case
-    when node['platform_version'].to_f <= 5.0
-      service_name "postgresql-#{node['postgresql']['version']}"
-    else
-      service_name "postgresql"
-    end
-  end
+  service_name node['postgresql']['server']['service_name']
   supports :restart => true, :status => true, :reload => true
   action [:enable, :start]
 end

recipes/server_redhat.rb

@@ -56,14 +56,14 @@
   package "postgresql-server"
 end
 
-# Following not valid for 9.x version of postgresql
 if node['postgresql']['version'].to_f < 9.0
-  execute "/sbin/service postgresql initdb" do
+  execute "/sbin/service #{node['postgresql']['server']['service_name']} initdb" do
     not_if { ::FileTest.exist?(File.join(node['postgresql']['dir'], "PG_VERSION")) }
   end
 end
 
 service "postgresql" do
+  service_name node['postgresql']['server']['service_name']
   supports :restart => true, :status => true, :reload => true
   action [:enable, :start]
 end