X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..ff20e3ccee15f5defc496d71207cf01db4e26607:/cookbooks/postgresql/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index c054a138b..c71416350 100644
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -17,12 +17,7 @@
 # limitations under the License.
 #
 
-if File.exists?("/etc/init.d/postgresql")
-  service "postgresql" do
-    action [ :enable, :start ]
-    supports :status => true, :restart => true, :reload => true
-  end
-end
+package "postgresql-common"
 
 node[:postgresql][:versions].each do |version|
   package "postgresql-#{version}"
@@ -30,13 +25,6 @@ node[:postgresql][:versions].each do |version|
   package "postgresql-contrib-#{version}"
   package "postgresql-server-dev-#{version}"
 
-  if File.exists?("/etc/init.d/postgresql-#{version}")
-    service "postgresql-#{version}" do
-      action [ :enable, :start ]
-      supports :status => true, :restart => true, :reload => true
-    end
-  end
-
   defaults = node[:postgresql][:settings][:defaults] || {}
   settings = node[:postgresql][:settings][version] || {}
 
@@ -44,40 +32,28 @@ node[:postgresql][:versions].each do |version|
     source "postgresql.conf.erb"
     owner "postgres"
     group "postgres"
-    mode 0644
+    mode 0o644
     variables :version => version, :defaults => defaults, :settings => settings
-    if File.exists?("/etc/init.d/postgresql-#{version}")
-      notifies :reload, resources(:service => "postgresql-#{version}")
-    else
-      notifies :reload, resources(:service => "postgresql")
-    end
+    notifies :reload, "service[postgresql]"
   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do
     source "pg_hba.conf.erb"
     owner "postgres"
     group "postgres"
-    mode 0640
+    mode 0o640
     variables :early_rules => settings[:early_authentication_rules] || defaults[:early_authentication_rules],
               :late_rules => settings[:late_authentication_rules] || defaults[:late_authentication_rules]
-    if File.exists?("/etc/init.d/postgresql-#{version}")
-      notifies :reload, resources(:service => "postgresql-#{version}")
-    else
-      notifies :reload, resources(:service => "postgresql")
-    end
+    notifies :reload, "service[postgresql]"
   end
 
   template "/etc/postgresql/#{version}/main/pg_ident.conf" do
     source "pg_ident.conf.erb"
     owner "postgres"
     group "postgres"
-    mode 0640
+    mode 0o640
     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
-    if File.exists?("/etc/init.d/postgresql-#{version}")
-      notifies :reload, resources(:service => "postgresql-#{version}")
-    else
-      notifies :reload, resources(:service => "postgresql")
-    end
+    notifies :reload, "service[postgresql]"
   end
 
   link "/var/lib/postgresql/#{version}/main/server.crt" do
@@ -88,34 +64,40 @@ node[:postgresql][:versions].each do |version|
     to "/etc/ssl/private/ssl-cert-snakeoil.key"
   end
 
-  restore_command = settings[:restore_command] || defaults[:restore_command]
   standby_mode = settings[:standby_mode] || defaults[:standby_mode]
+  primary_conninfo = settings[:primary_conninfo] || defaults[:primary_conninfo]
+  restore_command = settings[:restore_command] || defaults[:restore_command]
 
   if restore_command || standby_mode == "on"
+    passwords = if primary_conninfo
+                  data_bag_item(primary_conninfo[:passwords][:bag],
+                                primary_conninfo[:passwords][:item])
+                end
+
     template "/var/lib/postgresql/#{version}/main/recovery.conf" do
       source "recovery.conf.erb"
       owner "postgres"
       group "postgres"
-      mode 0640
-      variables :defaults => defaults, :settings => settings
-      if File.exists?("/etc/init.d/postgresql-#{version}")
-        notifies :reload, resources(:service => "postgresql-#{version}")
-      else
-        notifies :reload, resources(:service => "postgresql")
-      end
+      mode 0o640
+      variables :standby_mode => standby_mode,
+                :primary_conninfo => primary_conninfo,
+                :restore_command => restore_command,
+                :passwords => passwords
+      notifies :reload, "service[postgresql]"
     end
   else
     template "/var/lib/postgresql/#{version}/main/recovery.conf" do
       action :delete
-      if File.exists?("/etc/init.d/postgresql-#{version}")
-        notifies :reload, resources(:service => "postgresql-#{version}")
-      else
-        notifies :reload, resources(:service => "postgresql")
-      end
+      notifies :reload, "service[postgresql]"
     end
   end
 end
 
+service "postgresql" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
+end
+
 ohai_plugin "postgresql" do
   template "ohai.rb.erb"
 end
@@ -125,7 +107,7 @@ package "libdbd-pg-perl"
 
 clusters = node[:postgresql][:clusters] || []
 
-clusters.each do |name,details|
+clusters.each do |name, details|
   suffix = name.tr("/", ":")
 
   munin_plugin "postgres_bgwriter_#{suffix}" do
@@ -158,11 +140,11 @@ clusters.each do |name,details|
     conf_variables :port => details[:port]
   end
 
-  if File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf")
-    munin_plugin "postgres_replication_#{suffix}" do
-      target "postgres_replication"
-      conf "munin.erb"
-      conf_variables :port => details[:port]
-    end
+  next unless File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf")
+
+  munin_plugin "postgres_replication_#{suffix}" do
+    target "postgres_replication"
+    conf "munin.erb"
+    conf_variables :port => details[:port]
   end
 end