Block more heavy user apps and sites

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 401f1f75596fcdaff28d50ac698f90ce990958da..504fd6f0d9e00b64dc216786e680357a09ed0ebd 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -1,34 +1,46 @@
 name "nominatim"
 name "nominatim"

-description "Role applied to all nominatim servers"
+description "Role applied to all nominatim servers."

 
 default_attributes(
   :accounts => {
     :users => {
       :lonvia => { :status => :administrator },
 
 default_attributes(
   :accounts => {
     :users => {
       :lonvia => { :status => :administrator },

-      :twain => { :status => :administrator }
+      :twain => { :status => :administrator },
+      :nominatim => {
+        :status => :role,
+        :members => [:lonvia, :tomh, :twain]
+      }

     }
   },
   :apache => {
     :mpm => "event",
     }
   },
   :apache => {
     :mpm => "event",

-    :timeout => 60,
+    :timeout => 30,

     :keepalive => false,
     :keepalive => false,

+    :reqtimeout => true,

     :event => {
     :event => {

-      :max_clients => 560,
-      :threads_per_child => 35
+      :server_limit => 60,
+      :max_request_workers => 2400,
+      :threads_per_child => 50,
+      :min_spare_threads => 125,
+      :max_spare_threads => 925,
+      :async_request_worker_factor => 4,
+      :listen_cores_buckets_ratio => 6

     }
   },
     }
   },

-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:2/sec:15"
+    }

   },
   :postgresql => {
   },
   :postgresql => {

-    :versions => [ "9.1" ],

     :settings => {
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
     :settings => {
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",

-        :checkpoint_segments => "50",
+        :checkpoint_segments => "32",

         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",

+        :shared_buffers => "2GB",

         :autovacuum_max_workers => "1"
       }
     }
         :autovacuum_max_workers => "1"
       }
     }


@@ -36,14 +48,39 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",

-      :parameters => { 
-        "kernel.shmmax" => 16 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 16 * 1024 * 1024 * 1024 / 4096
+      :parameters => {
+        "kernel.shmmax" => 26 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
+      }
+    },
+    :kernel_scheduler_tune => {
+      :comment => "Tune kernel scheduler preempt",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => 10000000,
+        "kernel.sched_wakeup_granularity_ns" => 15000000
+      }
+    },
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
+    },
+    :network_conntrack_time_wait => {
+      :comment => "Only track completed connections for 30 seconds",
+      :parameters => {
+        "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
+      }
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
+      :parameters => {
+        "net.netfilter.nf_conntrack_max" => "131072"

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "recipe[nominatim]"
+  "recipe[nominatim::default]"

 )
 )