From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 17 Jul 2016 09:43:30 +0000 (+0200)
Subject: nominatim: add separate fpm-pool for details
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/56d96508993293278dfd1ee741c39e5ea880f2b3

nominatim: add separate fpm-pool for details
---

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index d14a5c8ed..ece1c9e56 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -57,7 +57,8 @@
 
     # regular requests and autoblocks
     RewriteMap bulklist txt:<%= @directory %>/settings/ip_blocks.map
-    RewriteRule ^/(search|reverse|details|lookup)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT]
+    RewriteRule ^/(search|reverse|lookup)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT]
+    RewriteRule ^/details(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|details}/$1.php$3 [PT]
 
 </VirtualHost>
 
diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 50e4d3b2d..cad14d6fd 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -47,18 +47,6 @@ default_attributes(
       :cluster => "9.4/main",
       :dbname => "nominatim",
       :postgis => "2.1"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
     }
   },
   :sysfs => {
diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 6785c0023..94c41e701 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -84,6 +84,23 @@ default_attributes(
       "Aux_Data" => "aux",
       "Aux_Index" => "aux"
     },
+    :fpm_pools => {
+      :www => {
+        :port => "8000",
+        :pm => "dynamic",
+        :max_children => "60"
+      },
+      :bulk => {
+        :port => "8001",
+        :pm => "static",
+        :max_children => "10"
+      },
+      :details => {
+        :port => "8002",
+        :pm => "static",
+        :max_children => "2"
+      },
+    },
     :redirects => {}
   }
 )
diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index f7a9347b6..e1b21e67d 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -37,18 +37,6 @@ default_attributes(
       :dbname => "nominatim",
       :postgis => "2.1"
     },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    },
     :redirects => {
     }
   },