apache: use new combined_extended log format instead of combined

[chef.git] / roles / db-master.rb

diff --git a/roles/db-master.rb b/roles/db-master.rb
index 8539ff452987dfd6baf83dccf8689147386a8c00..36d70e9023531d7fe6461a9b335f84a2c5b2c79d 100644 (file)
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -3,22 +3,12 @@ description "Role applied to all the master database server"
 
 default_attributes(
   :postgresql => {
 
 default_attributes(
   :postgresql => {

+    :monitor_queries => true,

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :wal_level => "logical",

         :archive_mode => "on",
         :archive_mode => "on",

-        :archive_command => "/usr/local/bin/openstreetmap-wal-e --terse wal-push %p",
-        :max_wal_senders => "4",
-        :max_replication_slots => "1",
-        :late_authentication_rules => [
-          { :database => "replication", :user => "replication", :address => "10.0.0.4/32" },   # snap-02
-          { :database => "replication", :user => "replication", :address => "10.0.0.10/32" },  # eddie
-          { :database => "replication", :user => "replication", :address => "10.0.32.40/32" }, # katla
-          { :database => "replication", :user => "replication", :address => "10.0.48.5/32" },  # ramoth
-          { :database => "replication", :user => "replication", :address => "10.0.48.49/32" }, # snap-01
-          { :database => "replication", :user => "replication", :address => "10.0.48.50/32" }, # karm
-          { :database => "replication", :user => "replication", :address => "10.0.64.50/32" }  # snap-03
-        ]
+        :archive_command => "/usr/local/bin/openstreetmap-wal-g wal-push %p --walg-prevent-wal-overwrite=true",
+        :wal_keep_size => "16384"

       }
     }
   }
       }
     }
   }