X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/61cfb2e7be9b887d3d0890d8804ad3339fbb7d73..7fdccdf940e933f4d918cd827ff8f26bfe75fe11:/cookbooks/nominatim/templates/default/apache.erb diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb index de4fb525e..5cdd947bc 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 - - ServerName nominatim.openstreetmap.org - ServerAdmin webmaster@openstreetmap.org +<% [80, 443].each do |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 -%> - Alias /pool-www/ "<%= @directory %>/website/" - - 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 - - Alias /pool-bulk/ "<%= @directory %>/website/" - - 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 + +<% 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 -%> + + + <% @pools.each do |name,details| -%> + Alias /pool-<%= name %>/ "<%= @directory %>/website/" + /(.*\.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 -%> + + <% end -%> + +<% if node[:lsb][:release].to_f >= 14.04 -%> + Redirect 429 /pool-block/ + ErrorDocument 429 /509.html + + ErrorDocument 429 /509.html - Redirect 509 /pool-block/ - ErrorDocument 509 /509.html +<% else -%> + Redirect 420 /pool-block/ + ErrorDocument 420 /509.html - ErrorDocument 509 /509.html + ErrorDocument 420 /509.html +<% end -%> Redirect 403 /pool-ban/ ErrorDocument 403 /403.html @@ -57,3 +81,5 @@ RewriteRule ^/([sdr].*) /pool-${bulklist:%{REMOTE_ADDR}|www}/$1 [PT] + +<% end -%>