Update CiviCRM to 4.6.12

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index fd8457ec57225f04a5bcfb0a3ffda3a020754325..b49ffabd949cca73ccf39af81622698076de0ece 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -2,6 +2,9 @@ name "yevaud"
 description "Master role applied to yevaud"
 
 default_attributes(
 description "Master role applied to yevaud"
 
 default_attributes(

+  :apt => {
+    :sources => ["postgresql"]
+  },

   :devices => {
     :osdisktune1 => {
       :comment => "Tune os disk",
   :devices => {
     :osdisktune1 => {
       :comment => "Tune os disk",


@@ -55,8 +58,8 @@ default_attributes(
       },
       :load => {
         :load => {
       },
       :load => {
         :load => {

-          :warning => 250,
-          :critical => 300
+          :warning => 400,
+          :critical => 500

         }
       }
     }
         }
       }
     }


@@ -75,9 +78,9 @@ default_attributes(
     :versions => ["9.4"],
     :settings => {
       :defaults => {
     :versions => ["9.4"],
     :settings => {
       :defaults => {

-        :shared_buffers => "3GB",
+        :shared_buffers => "8GB",

         :maintenance_work_mem => "7144MB",
         :maintenance_work_mem => "7144MB",

-        :effective_cache_size => "8GB"
+        :effective_cache_size => "16GB"

       }
     }
   },
       }
     }
   },


@@ -85,15 +88,8 @@ default_attributes(
     :postgres => {
       :comment => "Increase shared memory for postgres",
       :parameters => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
       :parameters => {

-        "kernel.shmmax" => 4 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 4 * 1024 * 1024 * 1024 / 4096
-      }
-    },
-    :cpu_tune => {
-      :comment => "Tune kern sched migration cost",
-      :parameters => {
-        "kernel.sched_autogroup_enabled" => 0,
-        "kernel.sched_migration_cost_ns" => 25000000
+        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096

       }
     }
   },
       }
     }
   },