Merge branch 'COOK-1508'

sous-chefs · Nov 5, 2012 · 706af89 · 706af89
2 parents 3829fc8 + 202cb8f
commit 706af89
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 41 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -22,55 +22,55 @@
 
   case
   when platform_version.to_f <= 5.0
-    default[:postgresql][:version] = "8.3"
+    default['postgresql']['version'] = "8.3"
   when platform_version.to_f == 6.0
-    default[:postgresql][:version] = "8.4"
+    default['postgresql']['version'] = "8.4"
   else
-    default[:postgresql][:version] = "9.1"
+    default['postgresql']['version'] = "9.1"
   end
 
-  set[:postgresql][:dir] = "/etc/postgresql/#{node[:postgresql][:version]}/main"
+  set['postgresql']['dir'] = "/etc/postgresql/#{node['postgresql']['version']}/main"
   default['postgresql']['client']['packages'] = %w{postgresql-client libpq-dev}
   default['postgresql']['server']['packages'] = %w{postgresql}
 
 when "ubuntu"
 
   case
   when platform_version.to_f <= 9.04
-    default[:postgresql][:version] = "8.3"
+    default['postgresql']['version'] = "8.3"
   when platform_version.to_f <= 11.04
-    default[:postgresql][:version] = "8.4"
+    default['postgresql']['version'] = "8.4"
   else
-    default[:postgresql][:version] = "9.1"
+    default['postgresql']['version'] = "9.1"
   end
 
-  set[:postgresql][:dir] = "/etc/postgresql/#{node[:postgresql][:version]}/main"
+  set['postgresql']['dir'] = "/etc/postgresql/#{node['postgresql']['version']}/main"
   default['postgresql']['client']['packages'] = %w{postgresql-client libpq-dev}
   default['postgresql']['server']['packages'] = %w{postgresql}
 
 when "fedora"
 
   if platform_version.to_f <= 12
-    default[:postgresql][:version] = "8.3"
+    default['postgresql']['version'] = "8.3"
   else
-    default[:postgresql][:version] = "8.4"
+    default['postgresql']['version'] = "8.4"
   end
 
-  set[:postgresql][:dir] = "/var/lib/pgsql/data"
+  set['postgresql']['dir'] = "/var/lib/pgsql/data"
   default['postgresql']['client']['packages'] = %w{postgresql-devel}
   default['postgresql']['server']['packages'] = %w{postgresql-server}
 
 when "amazon"
 
-  default[:postgresql][:version] = "8.4"
-  set[:postgresql][:dir] = "/var/lib/pgsql/data"
+  default['postgresql']['version'] = "8.4"
+  set['postgresql']['dir'] = "/var/lib/pgsql/data"
   default['postgresql']['client']['packages'] = %w{postgresql-devel}
   default['postgresql']['server']['packages'] = %w{postgresql-server}
 
 when "redhat","centos","scientific"
 
-  default[:postgresql][:version] = "8.4"
-  set[:postgresql][:dir] = "/var/lib/pgsql/data"
+  default['postgresql']['version'] = "8.4"
+  set['postgresql']['dir'] = "/var/lib/pgsql/data"
 
   if node['platform_version'].to_f >= 6.0
     default['postgresql']['client']['packages'] = %w{postgresql-devel}
@@ -82,21 +82,22 @@
 
 when "suse"
 
-  if platform_version.to_f <= 11.1
-    default[:postgresql][:version] = "8.3"
+  case
+  when platform_version.to_f <= 11.1
+    default['postgresql']['version'] = "8.3"
   else
-    default[:postgresql][:version] = "8.4"
+    default['postgresql']['version'] = "9.0"
   end
 
-  set[:postgresql][:dir] = "/var/lib/pgsql/data"
+  set['postgresql']['dir'] = "/var/lib/pgsql/data"
   default['postgresql']['client']['packages'] = %w{postgresql-client libpq-dev}
   default['postgresql']['server']['packages'] = %w{postgresql-server}
 
 else
-  default[:postgresql][:version] = "8.4"
-  set[:postgresql][:dir]         = "/etc/postgresql/#{node[:postgresql][:version]}/main"
+  default['postgresql']['version'] = "8.4"
+  set['postgresql']['dir']         = "/etc/postgresql/#{node['postgresql']['version']}/main"
   default['postgresql']['client']['packages'] = ["postgresql"]
   default['postgresql']['server']['packages'] = ["postgresql"]
 end
 
-default[:postgresql][:listen_addresses] = "localhost"
+default['postgresql']['listen_addresses'] = "localhost"
diff --git a/recipes/server.rb b/recipes/server.rb
@@ -24,30 +24,29 @@
 include_recipe "postgresql::client"
 
 # randomly generate postgres password
-node.set_unless[:postgresql][:password][:postgres] = secure_password
+node.set_unless['postgresql']['password']['postgres'] = secure_password
 node.save unless Chef::Config[:solo]
 
-case node[:postgresql][:version]
-when "8.3"
-  node.default[:postgresql][:ssl] = "off"
-when "8.4"
-  node.default[:postgresql][:ssl] = "true"
+if node['postgresql']['version'].to_f <= 8.3
+  node.default['postgresql']['ssl'] = "off"
+else
+  node.default['postgresql']['ssl'] = "true"
 end
 
 # Include the right "family" recipe for installing the server
 # since they do things slightly differently.
-case node.platform
+case node['platform']
 when "redhat", "centos", "fedora", "suse", "scientific", "amazon"
   include_recipe "postgresql::server_redhat"
 when "debian", "ubuntu"
   include_recipe "postgresql::server_debian"
 end
 
-template "#{node[:postgresql][:dir]}/pg_hba.conf" do
+template "#{node['postgresql']['dir']}/pg_hba.conf" do
   source "pg_hba.conf.erb"
   owner "postgres"
   group "postgres"
-  mode 0600
+  mode 00600
   notifies :reload, resources(:service => "postgresql"), :immediately
 end
 
@@ -58,7 +57,7 @@
 bash "assign-postgres-password" do
   user 'postgres'
   code <<-EOH
-echo "ALTER ROLE postgres ENCRYPTED PASSWORD '#{node[:postgresql][:password][:postgres]}';" | psql
+echo "ALTER ROLE postgres ENCRYPTED PASSWORD '#{node['postgresql']['password']['postgres']}';" | psql
   EOH
   not_if "echo '\connect' | PGPASSWORD=#{node['postgresql']['password']['postgres']} psql --username=postgres --no-password -h localhost"
   action :run

diff --git a/recipes/server_debian.rb b/recipes/server_debian.rb
@@ -21,11 +21,11 @@
 
 include_recipe "postgresql::client"
 
-case node[:postgresql][:version]
-when "8.3"
-  node.default[:postgresql][:ssl] = "off"
-else # > 8.3
-  node.default[:postgresql][:ssl] = "true"
+
+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|
@@ -55,7 +55,7 @@
   action [:enable, :start]
 end
 
-template "#{node[:postgresql][:dir]}/postgresql.conf" do
+template "#{node['postgresql']['dir']}/postgresql.conf" do
   source "debian.postgresql.conf.erb"
   owner "postgres"
   group "postgres"

diff --git a/recipes/server_redhat.rb b/recipes/server_redhat.rb
@@ -44,16 +44,31 @@
   end
 end
 
-execute "/sbin/service postgresql initdb" do
-  not_if { ::FileTest.exist?(File.join(node.postgresql.dir, "PG_VERSION")) }
+case node['platform']
+when "redhat","centos","scientific"
+  case
+  when node['platform_version'].to_f >= 6.0
+    package "postgresql-server"
+  else
+    package "postgresql#{node['postgresql']['version'].split('.').join}-server"
+  end
+when "fedora","suse"
+  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
+    not_if { ::FileTest.exist?(File.join(node['postgresql']['dir'], "PG_VERSION")) }
+  end
 end
 
 service "postgresql" do
   supports :restart => true, :status => true, :reload => true
   action [:enable, :start]
 end
 
-template "#{node[:postgresql][:dir]}/postgresql.conf" do
+template "#{node['postgresql']['dir']}/postgresql.conf" do
   source "redhat.postgresql.conf.erb"
   owner "postgres"
   group "postgres"