Proxy chef to http for now

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 4e85a77efc8aa82b937158d440ae8f7ad9fd48d4..a98fd9f25a349ab3975e279a3a0922ec98bb7f99 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -18,15 +18,11 @@ default_attributes(
     :keepalive => false,
     :event => {
       :server_limit => 32,
     :keepalive => false,
     :event => {
       :server_limit => 32,

-      :max_clients => 800,
+      :max_clients => 1600,

       :threads_per_child => 50
     }
   },
       :threads_per_child => 50
     }
   },

-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },

   :postgresql => {
   :postgresql => {

-    :versions => [ "9.1" ],

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


@@ -45,24 +41,24 @@ default_attributes(
         "kernel.shmmax" => 26 * 1024 * 1024 * 1024,
         "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
       }
         "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
+      }

     }
   },
   :nominatim => {
     }
   },
   :nominatim => {

-    :repository => "git://git.openstreetmap.org/nominatim.git",
-    :database => {
-        :cluster => "9.1/main",
-        :dbname => "nominatim"
-    },
-    :fpm_pools => {
-        :www => {
-            :pm => "dynamic",
-            :max_children => "50"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "7"
-        }
-    }
+    :enabled => true,
+    :repository => "git://git.openstreetmap.org/nominatim.git"

   }
 )
 
   }
 )