X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b3f09d9ae4217543cc9c811bd9a47a70fd519c0a..38df5ffe2eaed2d8f8d57193ad5e408763d66e5e:/cookbooks/nominatim/templates/default/apache.erb

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 91fb9a2a8..9f3dcd34b 100644
--- 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,24 +28,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>
 
     <% @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>
     <% end -%>
 
-    Redirect 509 /pool-block/
-    ErrorDocument 509 /509.html
+    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>
@@ -54,3 +75,5 @@
     RewriteRule ^/([sdr].*) /pool-${bulklist:%{REMOTE_ADDR}|www}/$1 [PT]
 
 </VirtualHost>
+
+<% end -%>