Merge remote-tracking branch 'github/pull/688'

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

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

-    :versions => ["9.5"],
+    :monitor_queries => true,

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

-        :wal_level => "hot_standby",

         :archive_mode => "on",
         :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 => "146.179.159.168/32" },
-          { :database => "replication", :user => "replication", :address => "146.179.159.170/32" },
-          { :database => "replication", :user => "replication", :address => "10.0.0.10/32" },
-          { :database => "replication", :user => "replication", :address => "10.0.32.40/32" }
-        ]
-      }
-    }
-  },
-  :rsyncd => {
-    :modules => {
-      :archive => {
-        :comment => "WAL Archive",
-        :path => "/store/arrays/nvme/postgresql-archive",
-        :read_only => true,
-        :write_only => false,
-        :list => false,
-        :uid => "postgres",
-        :gid => "postgres",
-        :transfer_logging => false,
-        :hosts_allow => [
-          "146.179.159.168", "146.179.159.170, 10.0.0.10, 10.0.32.40"
-        ]
+        :archive_command => "/usr/local/bin/openstreetmap-wal-g wal-push %p --walg-prevent-wal-overwrite=true",
+        :wal_keep_size => "16384"

       }
     }
   }
       }
     }
   }