Merge branch 'planetdump-ng'

[chef.git] / cookbooks / nominatim / templates / default / apache.erb

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 8e12362d1f325b4effbf9ed13a76ceeedbf4e3eb..be0e48a59011c94d10ae1dbb26e448af0c82679d 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -2,13 +2,14 @@
 
 <% [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 -%>
     #
@@ -23,41 +24,44 @@
     DocumentRoot <%= @directory %>/website
     <Directory "<%= @directory %>/website/">
         DirectoryIndex search.php
-        Options MultiViews FollowSymLinks
-        AddType text/html   .php
-        AddType application/xml   .phpx
-        AddType application/json   .phpj
+        Options FollowSymLinks
 <% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/
-        ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/
-        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/
-<% 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
+        Require all granted
 <% end -%>
     </Directory>
 
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    ProxyPassMatch ^/([^/]*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
+<% else -%>
+    <LocationMatch ^/([^/]*\.php(/.*)?)$>
+        SetHandler fcgi:/var/run/php5-fpm-www.sock
+    </LocationMatch>
+<% end -%>
+
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
-    <Location /pool-<%= name %>>
 <% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/
-        ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/
-        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/
+    ProxyPassMatch ^/pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1
 <% 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
+    <LocationMatch ^/pool-<%= name %>/(.*\.php(/.*)?)$>
+        SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock
+    </LocationMatch>
 <% end -%>
-    </Location>
     <% 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
@@ -71,7 +75,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>