Remove platform specific template generation. Add generic config temp…

…late
sous-chefs · Nov 9, 2012 · 1e26521 · 1e26521
1 parent 3efc1a1
commit 1e26521
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/recipes/server.rb b/recipes/server.rb
@@ -42,7 +42,15 @@
   include_recipe "postgresql::server_debian"
 end
 
-template "#{node['postgresql']['dir']}/pg_hba.conf" do
+template "#{node[:postgresql][:dir]}/postgresql.conf" do
+  source "postgresql.conf.erb"
+  owner "postgres"
+  group "postgres"
+  mode 0600
+  notifies :restart, resources(:service => "postgresql"), :immediately
+end
+
+template "#{node[:postgresql][:dir]}/pg_hba.conf" do
   source "pg_hba.conf.erb"
   owner "postgres"
   group "postgres"

diff --git a/recipes/server_debian.rb b/recipes/server_debian.rb
@@ -54,11 +54,3 @@
   supports :restart => true, :status => true, :reload => true
   action [:enable, :start]
 end
-
-template "#{node['postgresql']['dir']}/postgresql.conf" do
-  source "debian.postgresql.conf.erb"
-  owner "postgres"
-  group "postgres"
-  mode 0600
-  notifies :restart, resources(:service => "postgresql"), :immediately
-end
diff --git a/recipes/server_redhat.rb b/recipes/server_redhat.rb
@@ -67,11 +67,3 @@
   supports :restart => true, :status => true, :reload => true
   action [:enable, :start]
 end
-
-template "#{node['postgresql']['dir']}/postgresql.conf" do
-  source "redhat.postgresql.conf.erb"
-  owner "postgres"
-  group "postgres"
-  mode 0600
-  notifies :restart, resources(:service => "postgresql"), :immediately
-end