nominatim: add separate fpm-pool for details

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index d14a5c8edfe372ad12c33323f57b944ef2c68471..ece1c9e56e6bba675033869e70669c7dc5b1c587 100644 (file)
--- 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 50e4d3b2d9faf705d4200b400c58ed85a593afd7..cad14d6fdc3cc3ddcde63768dcd7a5e6f0d3f533 100644 (file)
--- 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 6785c00239216594da7917525fa2e86f1c82ff46..94c41e70108bb8d44bd85c30072151e79177ddec 100644 (file)
--- 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 f7a9347b63f3fa37630870a7a74cc8ef107ad3dc..e1b21e67d7203a0e4ecbcbc0a5e027ea703017cf 100644 (file)
--- 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 => {
     }
   },