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

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index de4fb525e..c92e07325 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -1,6 +1,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<VirtualHost *:80>
+<% [80, 443].each do |port| -%>
+<VirtualHost *:<%= port %>>
     ServerName nominatim.openstreetmap.org
     ServerAdmin webmaster@openstreetmap.org
     ServerAlias nominatim.osm.org
@@ -9,6 +10,13 @@
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.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,27 +27,36 @@
         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 -%>
     </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
+    <% @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>
-    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
-    </Location>
-    Redirect 509 /pool-block/
-    ErrorDocument 509 /509.html
+    <% end -%>
+
+    Redirect 420 /pool-block/
+    ErrorDocument 420 /509.html
     <Location /pool-block>
-        ErrorDocument 509 /509.html
+        ErrorDocument 420 /509.html
     </Location>
     Redirect 403 /pool-ban/
     <Location /pool-ban>
@@ -57,3 +74,5 @@
     RewriteRule ^/([sdr].*) /pool-${bulklist:%{REMOTE_ADDR}|www}/$1 [PT]
 
 </VirtualHost>
+
+<% end -%>