X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/977122dbb6db324c53106b01dd794f0b316b2dd7..5fbc96e38dd8dfcb3eb1ed0a5f4319ccaf244d6d:/roles/db.rb?ds=sidebyside diff --git a/roles/db.rb b/roles/db.rb index 5e4aa0d0b..24ae10683 100644 --- a/roles/db.rb +++ b/roles/db.rb @@ -15,26 +15,6 @@ default_attributes( :enable => false } }, - :munin => { - :plugins => { - :postgres_connections_openstreetmap => { - :waiting => { - :warning => 10, - :critical => 20 - } - }, - :postgres_locks_openstreetmap => { - :accesssharelock => { - :warning => 900, - :critical => 1000 - }, - :rowexclusivelock => { - :warning => 250, - :critical => 300 - } - } - } - }, :postgresql => { :settings => { :defaults => { @@ -44,14 +24,17 @@ default_attributes( :wal_level => "logical", :max_wal_size => "1536MB", :checkpoint_completion_target => "0.8", - :max_wal_senders => "10", :cpu_tuple_cost => "0.1", :jit => "off", :log_min_duration_statement => "1000", :late_authentication_rules => [ - { :address => "10.0.32.0/20" }, - { :address => "10.0.48.0/20" }, - { :address => "10.0.64.0/20" } + { :address => "10.0.48.0/20" }, # amsterdam + { :address => "10.0.64.0/20" }, # dublin + { :database => "replication", :user => "replication", :address => "10.0.0.4/32" }, # snap-02 + { :database => "replication", :user => "replication", :address => "10.0.0.10/32" }, # eddie + { :database => "replication", :user => "replication", :address => "10.0.48.49/32" }, # snap-01 + { :database => "replication", :user => "replication", :address => "10.0.48.50/32" }, # karm + { :database => "replication", :user => "replication", :address => "10.0.64.50/32" } # snap-03 ] } }