Drop bytemark addresses from database access rules

[chef.git] / roles / db.rb

diff --git a/roles/db.rb b/roles/db.rb
index 6fcb9bd676b4da0209be354c593fea660000b847..ff308c8e58eb60f1ce7ad68cd6f403c6217fe785 100644 (file)
--- a/roles/db.rb
+++ b/roles/db.rb
@@ -10,6 +10,11 @@ default_attributes(
       }
     }
   },
+  :apt => {
+    :unattended_upgrades => {
+      :enable => false
+    }
+  },
   :munin => {
     :plugins => {
       :postgres_connections_openstreetmap => {
@@ -30,21 +35,22 @@ default_attributes(
       }
     }
   },
-  :nfs => {
-    "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
-  },
   :postgresql => {
-    :versions => ["9.1"],
     :settings => {
       :defaults => {
         :listen_addresses => "*",
-        :max_connections => "500",
+        :max_connections => "1500",
         :max_stack_depth => "7MB",
-        :checkpoint_segments => "32",
+        :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 => "146.179.159.160/27" }
+          { :address => "10.0.48.0/20" }, # amsterdam
+          { :address => "10.0.64.0/20" }  # dublin
         ]
       }
     }
@@ -58,7 +64,3 @@ default_attributes(
     }
   }
 )
-
-run_list(
-  "recipe[nfs]"
-)