Workaround horrendous ProxyPassMatch silliness

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 8e3ed5d0b29e83cca388398791583fcdfa405286..1c620147253cf76d6b1cf02464cc42388d6f450f 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -18,15 +18,11 @@ default_attributes(
     :keepalive => false,
     :event => {
       :server_limit => 32,
-      :max_clients => 800,
+      :max_clients => 1600,
       :threads_per_child => 50
     }
   },
-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },
   :postgresql => {
-    :versions => [ "9.1" ],
     :settings => {
       :defaults => {
         :max_connections => "450",
@@ -55,21 +51,8 @@ default_attributes(
     }
   },
   :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"
   }
 )