Merge remote-tracking branch 'github/pull/692'

[chef.git] / roles / db.rb

diff --git a/roles/db.rb b/roles/db.rb
index 7ff450b2ffba85e698c8912a5f3fb2230865e241..24ae106838bc76ee796153504a4579f3a064c633 100644 (file)
--- a/roles/db.rb
+++ b/roles/db.rb
@@ -15,41 +15,26 @@ 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 => {
         :listen_addresses => "*",
         :max_connections => "1500",
         :max_stack_depth => "7MB",
-        :checkpoint_segments => "32",
+        :wal_level => "logical",
         :max_wal_size => "1536MB",
         :checkpoint_completion_target => "0.8",
         :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
         ]
       }
     }