Generalise configuration of firewall sets

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

diff --git a/roles/db-master.rb b/roles/db-master.rb
index 3bfdbd7ca2fbccb9025176e1d3d82ea982f371de..3ebd79e826800fa1c422bb921938ebbb7eff91ab 100644 (file)
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -3,19 +3,10 @@ description "Role applied to all the master database server"
 
 default_attributes(
   :postgresql => {
-    :versions => ["9.5"],
     :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"
       }
     }
   }