Reorder authorization matches

[chef.git] / cookbooks / postgresql / recipes / default.rb

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 6a05f34e4fad6412a3b5e8f6c4ff75b23be5366e..a3ef7d23d9f4bb2ce687531510cc7c7cc184bc62 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apt"
+include_recipe "apt::postgresql"

 include_recipe "munin"
 include_recipe "prometheus"
 
 include_recipe "munin"
 include_recipe "prometheus"
 


@@ -33,13 +33,26 @@ node[:postgresql][:versions].each do |version|
   defaults = node[:postgresql][:settings][:defaults] || {}
   settings = node[:postgresql][:settings][version] || {}
 
   defaults = node[:postgresql][:settings][:defaults] || {}
   settings = node[:postgresql][:settings][version] || {}
 

+  standby_mode = settings[:standby_mode] || defaults[:standby_mode]
+  primary_conninfo = settings[:primary_conninfo] || defaults[:primary_conninfo]
+
+  passwords = if primary_conninfo
+                data_bag_item(primary_conninfo[:passwords][:bag],
+                              primary_conninfo[:passwords][:item])
+              end
+

   template "/etc/postgresql/#{version}/main/postgresql.conf" do
     source "postgresql.conf.erb"
     owner "postgres"
     group "postgres"
     mode "644"
   template "/etc/postgresql/#{version}/main/postgresql.conf" do
     source "postgresql.conf.erb"
     owner "postgres"
     group "postgres"
     mode "644"

-    variables :version => version, :defaults => defaults, :settings => settings
+    variables :version => version,
+              :defaults => defaults,
+              :settings => settings,
+              :primary_conninfo => primary_conninfo,
+              :passwords => passwords

     notifies :reload, "service[postgresql]"
     notifies :reload, "service[postgresql]"

+    only_if { ::Dir.exist?("/etc/postgresql/#{version}/main") }

   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do
   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do


@@ -50,6 +63,7 @@ node[:postgresql][:versions].each do |version|
     variables :early_rules => settings[:early_authentication_rules] || defaults[:early_authentication_rules],
               :late_rules => settings[:late_authentication_rules] || defaults[:late_authentication_rules]
     notifies :reload, "service[postgresql]"
     variables :early_rules => settings[:early_authentication_rules] || defaults[:early_authentication_rules],
               :late_rules => settings[:late_authentication_rules] || defaults[:late_authentication_rules]
     notifies :reload, "service[postgresql]"

+    only_if { ::Dir.exist?("/etc/postgresql/#{version}/main") }

   end
 
   template "/etc/postgresql/#{version}/main/pg_ident.conf" do
   end
 
   template "/etc/postgresql/#{version}/main/pg_ident.conf" do


@@ -59,41 +73,28 @@ node[:postgresql][:versions].each do |version|
     mode "640"
     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
     notifies :reload, "service[postgresql]"
     mode "640"
     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
     notifies :reload, "service[postgresql]"

+    only_if { ::Dir.exist?("/etc/postgresql/#{version}/main") }

   end
 
   link "/var/lib/postgresql/#{version}/main/server.crt" do
     to "/etc/ssl/certs/ssl-cert-snakeoil.pem"
   end
 
   link "/var/lib/postgresql/#{version}/main/server.crt" do
     to "/etc/ssl/certs/ssl-cert-snakeoil.pem"

+    only_if { ::Dir.exist?("/var/lib/postgresql/#{version}/main") }

   end
 
   link "/var/lib/postgresql/#{version}/main/server.key" do
     to "/etc/ssl/private/ssl-cert-snakeoil.key"
   end
 
   link "/var/lib/postgresql/#{version}/main/server.key" do
     to "/etc/ssl/private/ssl-cert-snakeoil.key"

+    only_if { ::Dir.exist?("/var/lib/postgresql/#{version}/main") }

   end
 
   end
 

-  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"
+  if standby_mode == "on"
+    file "/var/lib/postgresql/#{version}/main/standby.signal" do

       owner "postgres"
       group "postgres"
       mode "640"
       owner "postgres"
       group "postgres"
       mode "640"

-      variables :standby_mode => standby_mode,
-                :primary_conninfo => primary_conninfo,
-                :restore_command => restore_command,
-                :passwords => passwords
-      notifies :reload, "service[postgresql]"

     end
   else
     end
   else

-    template "/var/lib/postgresql/#{version}/main/recovery.conf" do
+    file "/var/lib/postgresql/#{version}/main/standby.signal" do

       action :delete
       action :delete

-      notifies :reload, "service[postgresql]"

     end
   end
 end
     end
   end
 end


@@ -154,11 +155,11 @@ clusters.each do |name, details|
   end
 end
 
   end
 end
 

-ports = clusters.collect do |_, details|
-  "port=#{details[:port]}"
+uris = clusters.collect do |_, details|
+  "postgres@:#{details[:port]}/postgres?host=/run/postgresql"

 end
 
 end
 

-template "/etc/prometheus/collectors/postgres_queries.yml" do
+template "/etc/prometheus/exporters/postgres_queries.yml" do

   source "postgres_queries.yml.erb"
   owner "root"
   group "root"
   source "postgres_queries.yml.erb"
   owner "root"
   group "root"


@@ -167,8 +168,14 @@ end
 
 prometheus_exporter "postgres" do
   port 9187
 
 prometheus_exporter "postgres" do
   port 9187

+  scrape_interval "1m"
+  scrape_timeout "1m"

   user "postgres"
   user "postgres"

-  options "--extend.query-path=/etc/prometheus/collectors/postgres_queries.yml"
-  environment "DATA_SOURCE_NAME" => "user=postgres host=/run/postgresql #{ports.join(',')}",
+  options "--extend.query-path=/etc/prometheus/exporters/postgres_queries.yml"
+  environment "DATA_SOURCE_URI" => uris.sort.uniq.first,
+              "PG_EXPORTER_AUTO_DISCOVER_DATABASES" => "true",

               "PG_EXPORTER_EXCLUDE_DATABASES" => "postgres,template0,template1"
               "PG_EXPORTER_EXCLUDE_DATABASES" => "postgres,template0,template1"

+  restrict_address_families "AF_UNIX"
+  remove_ipc false
+  subscribes :restart, "template[/etc/prometheus/exporters/postgres_queries.yml]"

 end
 end