Track backport branches of osm2pgsql git on irc

[chef.git] / roles / db.rb

diff --git a/roles/db.rb b/roles/db.rb
index 031865a6ca368464a28d4ca55a18058864ee43b4..f3c3244226aa5584cd1db562837150ca924b39c5 100644 (file)
--- a/roles/db.rb
+++ b/roles/db.rb
@@ -6,24 +6,29 @@ default_attributes(
     :users => {
       :rails => {
         :status => :role,
-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]
       }
     }
   },
+  :apt => {
+    :unattended_upgrades => {
+      :enable => false
+    }
+  },
   :munin => {
     :plugins => {
       :postgres_connections_openstreetmap => {
-        :waiting => { 
+        :waiting => {
           :warning => 10,
           :critical => 20
         }
       },
       :postgres_locks_openstreetmap => {
-        :accesssharelock => { 
+        :accesssharelock => {
           :warning => 900,
           :critical => 1000
         },
-        :rowexclusivelock => { 
+        :rowexclusivelock => {
           :warning => 250,
           :critical => 300
         }
@@ -31,19 +36,23 @@ default_attributes(
     }
   },
   :nfs => {
-    "/store/rails" => { :host => "horntail", :path => "/store/rails" }
+    "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :listen_addresses => "*",
-        :max_connections => "500",
+        :max_connections => "1000",
         :max_stack_depth => "7MB",
         :checkpoint_segments => "32",
+        :max_wal_size => "1536MB",
         :checkpoint_completion_target => "0.8",
+        :cpu_tuple_cost => "0.1",
         :late_authentication_rules => [
-          { :address => "146.179.159.160/27" }
+          { :address => "146.179.159.160/27" },
+          { :address => "10.0.16.0/20" },
+          { :address => "10.0.32.0/20" }
         ]
       }
     }