Fix up passing of paths to FCGI on apache 2.4

[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 de4fb525eefe0cf5ff51a81f4767f8ab3bfa7d9c..5cdd947bcc3e359704146d60e58ec4e335437168 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -1,13 +1,22 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<VirtualHost *:80>
-    ServerName nominatim.openstreetmap.org
-    ServerAdmin webmaster@openstreetmap.org
+<% [80, 443].each do |port| -%>
+<VirtualHost *:<%= port %>>
+    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
+<% end -%>
 
     CustomLog /var/log/apache2/nominatim.openstreetmap.org-access.log combined
     ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log
@@ -19,28 +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>
 
-    Alias /pool-www/ "<%= @directory %>/website/"
-    <Location /pool-www>
-        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
-    </Location>
-    Alias /pool-bulk/ "<%= @directory %>/website/"
-    <Location /pool-bulk>
-        AddHandler fcgi:/var/run/php5-fpm-bulk.sock .php
-        AddHandler fcgi:/var/run/php5-fpm-bulk.sock .phpx
-        AddHandler fcgi:/var/run/php5-fpm-bulk.sock .phpj
+    <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/"
+    <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>
-    Redirect 509 /pool-block/
-    ErrorDocument 509 /509.html
+<% else -%>
+    Redirect 420 /pool-block/
+    ErrorDocument 420 /509.html
     <Location /pool-block>
-        ErrorDocument 509 /509.html
+        ErrorDocument 420 /509.html
     </Location>
+<% end -%>
     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html
@@ -57,3 +81,5 @@
     RewriteRule ^/([sdr].*) /pool-${bulklist:%{REMOTE_ADDR}|www}/$1 [PT]
 
 </VirtualHost>
+
+<% end -%>