X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9b800b0b75b7d4c0a26ddfbe89f66f3bc7a6bd37..344abf5bde22aa66aa0411b15967f1c60d96db0b:/roles/db-master.rb diff --git a/roles/db-master.rb b/roles/db-master.rb index 78de0b69f..e29b7131c 100644 --- a/roles/db-master.rb +++ b/roles/db-master.rb @@ -3,16 +3,17 @@ description "Role applied to all the master database server" default_attributes( :postgresql => { - :versions => ["9.1"], + :versions => ["9.5"], :settings => { :defaults => { :wal_level => "hot_standby", :archive_mode => "on", - :archive_command => "/bin/cp %p /store/postgresql/archive/%f", - :max_wal_senders => "2", + :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" } ] } @@ -30,7 +31,7 @@ default_attributes( :gid => "postgres", :transfer_logging => false, :hosts_allow => [ - "146.179.159.168", "146.179.159.170, 10.0.32.40" + "146.179.159.168", "146.179.159.170, 10.0.0.10, 10.0.32.40" ] } }