X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4f6e8225fdfcd054fdb09f61b8be1e3e2684197c..7fdccdf940e933f4d918cd827ff8f26bfe75fe11:/cookbooks/nominatim/templates/default/apache.erb diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb index 8e12362d1..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| -%> > - 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 -%> # @@ -28,36 +29,42 @@ AddType application/xml .phpx AddType application/json .phpj <% if node[:lsb][:release].to_f >= 14.04 -%> - ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/ - ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/ - ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/ -<% 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 + Require all granted <% end -%> + +<% 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 ^/(.*\.php(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/ - ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/ - ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/ + ProxyPassMatch fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1 <% 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 + 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 + +<% else -%> Redirect 420 /pool-block/ ErrorDocument 420 /509.html ErrorDocument 420 /509.html +<% end -%> Redirect 403 /pool-ban/ ErrorDocument 403 /403.html