imagery: increase gdal memory allowance

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 8e3ed5d0b29e83cca388398791583fcdfa405286..9564e11831d4a3e7ed6689ff490e00c1ae9afb3a 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -1,5 +1,5 @@
 name "nominatim"
 name "nominatim"

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

 
 default_attributes(
   :accounts => {
 
 default_attributes(
   :accounts => {


@@ -8,32 +8,40 @@ default_attributes(
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,

-        :members => [ :lonvia, :tomh, :twain ]
-      },
+        :members => [:lonvia, :tomh, :twain]
+      }

     }
   },
   :apache => {
     :mpm => "event",
     :timeout => 60,
     :keepalive => false,
     }
   },
   :apache => {
     :mpm => "event",
     :timeout => 60,
     :keepalive => false,

+    :reqtimeout => true,

     :event => {
       :server_limit => 32,
     :event => {
       :server_limit => 32,

-      :max_clients => 800,
-      :threads_per_child => 50
+      :max_request_workers => 1600,
+      :threads_per_child => 50,
+      :min_spare_threads => 125,
+      :max_spare_threads => 925

     }
   },
   :apt => {
     }
   },
   :apt => {

-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
+    :sources => ["postgresql"]
+  },
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:7/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"
       }
     }


@@ -41,7 +49,7 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",

-      :parameters => { 
+      :parameters => {

         "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
       }


@@ -52,27 +60,28 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }

-    }
-  },
-  :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"
-        }
+    :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]"

 )
 )