Revert "Disable OAuth 1.0a and basic authentication"

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

diff --git a/roles/db-master.rb b/roles/db-master.rb
index 19f9d55d95bf2f3732dac5a06b6a79f32e9bcefe..36d70e9023531d7fe6461a9b335f84a2c5b2c79d 100644 (file)
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -3,18 +3,12 @@ description "Role applied to all the master database server"
 
 default_attributes(
   :postgresql => {
+    :monitor_queries => true,
     :settings => {
       :defaults => {
-        :wal_level => "hot_standby",
         :archive_mode => "on",
-        :archive_command => "/usr/local/bin/openstreetmap-wal-e --terse wal-push %p",
-        :max_wal_senders => "3",
-        :late_authentication_rules => [
-          { :database => "replication", :user => "replication", :address => "10.0.48.50/32" },
-          { :database => "replication", :user => "replication", :address => "10.0.48.5/32" },
-          { :database => "replication", :user => "replication", :address => "10.0.0.10/32" },
-          { :database => "replication", :user => "replication", :address => "10.0.32.40/32" }
-        ]
+        :archive_command => "/usr/local/bin/openstreetmap-wal-g wal-push %p --walg-prevent-wal-overwrite=true",
+        :wal_keep_size => "16384"
       }
     }
   }