X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9bbbc3c9787cfbd671b7cb226be9b88ea6ac128a..65c53a4d15f8b5a7e4b56846962432a669a8b9d2:/roles/db-master.rb diff --git a/roles/db-master.rb b/roles/db-master.rb index 3472f1d98..3bfdbd7ca 100644 --- a/roles/db-master.rb +++ b/roles/db-master.rb @@ -3,41 +3,18 @@ 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", - :user_name_maps => { - :backup => [ - { :system => "osmbackup", :postgres => "backup" } - ] - }, - :early_authentication_rules => [ - { :type => "local", :database => "all", :user => "backup", :method => "peer", :options => { :map => "backup" } } - ], + :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.173/32" } - ] - } - } - }, - :rsyncd => { - :modules => { - :archive => { - :comment => "WAL Archive", - :path => "/store/postgresql/system/archive", - :read_only => true, - :write_only => false, - :list => false, - :uid => "postgres", - :gid => "postgres", - :transfer_logging => false, - :hosts_allow => [ - "146.179.159.168" + { :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" } ] } }