X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/720abae3e8f61545f741e649c38b810493790830..e9ff3d48e1e9503c5dc2892a14dd2d2fb8d6b6ea:/cookbooks/nominatim/templates/default/apache.erb

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index c92e07325..c71106d08 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -2,19 +2,21 @@
 
 <% [80, 443].each do |port| -%>
 <VirtualHost *:<%= port %>>
-    ServerName nominatim.openstreetmap.org
-    ServerAdmin webmaster@openstreetmap.org
+    ServerName <%= node[:fqdn] %>
+    ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.osm.org
     ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.openstreetmap.net
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.org
+    ServerAdmin webmaster@openstreetmap.org
 
 <% if port == 443 -%>
     #
     # Enable SSL
     #
     SSLEngine on
+    SSLProxyEngine on
 <% end -%>
 
     CustomLog /var/log/apache2/nominatim.openstreetmap.org-access.log combined
@@ -23,40 +25,24 @@
     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 -%>
-        ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%>/
-        ProxyPassMatch ^/(.*\.phpx(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%>/
-        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%>/
-<% else -%>
-        AddHandler fcgi:/var/run/php5-fpm-www.sock .php
-        AddHandler fcgi:/var/run/php5-fpm-www.sock .phpx
-        AddHandler fcgi:/var/run/php5-fpm-www.sock .phpj
-<% end -%>
+        Options FollowSymLinks
+        Require all granted
     </Directory>
 
+    ProxyPassMatch ^/([^/]*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
+
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
-    <Location /pool-<%= name %>>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:<%= details[:port ]%>/
-        ProxyPassMatch ^/(.*\.phpx(/.*)?)$ fcgi://127.0.0.1:<%= details[:port ]%>/
-        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ fcgi://127.0.0.1:<%= details[:port ]%>/
-<% else -%>
-        AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .php
-        AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .phpx
-        AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .phpj
-<% end -%>
-    </Location>
+    <% 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 -%>
 
-    Redirect 420 /pool-block/
-    ErrorDocument 420 /509.html
+    Redirect 429 /pool-block/
+    ErrorDocument 429 /509.html
     <Location /pool-block>
-        ErrorDocument 420 /509.html
+        ErrorDocument 429 /509.html
     </Location>
     Redirect 403 /pool-ban/
     <Location /pool-ban>
@@ -71,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)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT]
 
 </VirtualHost>