X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b4aedce6d4a03bb275d45b32934c40bba5e06774..c3d4f394005725d7069dda1947a5419eeb7b2e55:/cookbooks/nominatim/templates/default/apache.erb

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 120bccece..5cdd947bc 100644
--- 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 -%>
     #
@@ -27,25 +28,43 @@
         AddType text/html   .php
         AddType application/xml   .phpx
         AddType application/json   .phpj
-        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
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+        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>
+
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
-    <Location /pool-<%= name %>>
-        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
-    </Location>
+    <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>
     <% 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