X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0fc444d10eef30ff318e8269d6bd5553f837d8de..95e1e4603eb8c32acf8ee58c845ec4ce5bfdd56c:/cookbooks/nominatim/templates/default/apache.erb?ds=sidebyside

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 5cdd947bc..d14a5c8ed 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -16,6 +16,7 @@
     # Enable SSL
     #
     SSLEngine on
+    SSLProxyEngine on
 <% end -%>
 
     CustomLog /var/log/apache2/nominatim.openstreetmap.org-access.log combined
@@ -24,47 +25,25 @@
     DocumentRoot <%= @directory %>/website
     <Directory "<%= @directory %>/website/">
         DirectoryIndex search.php
-        Options MultiViews FollowSymLinks
-        AddType text/html   .php
-        AddType application/xml   .phpx
-        AddType application/json   .phpj
-<% if node[:lsb][:release].to_f >= 14.04 -%>
+        Options FollowSymLinks
         Require all granted
-<% end -%>
     </Directory>
 
-    <LocationMatch /((?!pool-.*).*\.php[xj]?(/.*)?)$>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
-<% else -%>
-        SetHandler fcgi:/var/run/php5-fpm-www.sock
-<% end -%>
-    </LocationMatch>
+    ProxyPassMatch ^/([^/]*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
-    <LocationMatch /pool-<%= name %>/(.*\.php[xj]?(/.*)?)$>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1
-<% else -%>
-        SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock
-<% end -%>
-    </LocationMatch>
+    <% node[:nominatim][:redirects].each do |url,host| -%>
+    ProxyPassMatch ^/pool-<%= name %>/(<%= url %>\.php(/.*)?) http<% if port == 443 -%>s<% end -%>://<%= host %>/pool-<%= name %>/$1
+    <% end -%>
+    ProxyPassMatch ^/pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1
     <% end -%>
 
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Redirect 429 /pool-block/
     ErrorDocument 429 /509.html
     <Location /pool-block>
         ErrorDocument 429 /509.html
     </Location>
-<% else -%>
-    Redirect 420 /pool-block/
-    ErrorDocument 420 /509.html
-    <Location /pool-block>
-        ErrorDocument 420 /509.html
-    </Location>
-<% end -%>
     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html
@@ -78,7 +57,7 @@
 
     # regular requests and autoblocks
     RewriteMap bulklist txt:<%= @directory %>/settings/ip_blocks.map
-    RewriteRule ^/([sdr].*) /pool-${bulklist:%{REMOTE_ADDR}|www}/$1 [PT]
+    RewriteRule ^/(search|reverse|details|lookup)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT]
 
 </VirtualHost>