X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/23c44b88c2893df2a34cffff6896e62c67ff8adc..c7f83fdaf5ca1fdbe4e051e32f66c7d85913a84e:/roles/db.rb

diff --git a/roles/db.rb b/roles/db.rb
index 81aed8678..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 => {
@@ -42,16 +22,19 @@ default_attributes(
         :max_connections => "1500",
         :max_stack_depth => "7MB",
         :wal_level => "logical",
-        :checkpoint_segments => "32",
         :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
         ]
       }
     }