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

[chef.git] / roles / db.rb

diff --git a/roles/db.rb b/roles/db.rb
index 670b745fd78a264aefa9ed50ac8f7dbee8998275..7ff450b2ffba85e698c8912a5f3fb2230865e241 100644 (file)
--- a/roles/db.rb
+++ b/roles/db.rb
@@ -35,21 +35,21 @@ 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",
+        :max_wal_size => "1536MB",
         :checkpoint_completion_target => "0.8",
         :cpu_tuple_cost => "0.1",
+        :log_min_duration_statement => "1000",
         :late_authentication_rules => [
-          { :address => "146.179.159.160/27" }
+          { :address => "10.0.32.0/20" },
+          { :address => "10.0.48.0/20" },
+          { :address => "10.0.64.0/20" }
         ]
       }
     }
@@ -63,7 +63,3 @@ default_attributes(
     }
   }
 )
-
-run_list(
-  "recipe[nfs]"
-)