X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/592e808593b1b5651b7130cab8122a2ab0b7df7e..ecc865a502c5c8d1b6dd1ed3814c190da0d127b4:/cookbooks/nominatim/templates/default/apache.erb diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb index 9f3dcd34b..1c8c82f7d 100644 --- a/cookbooks/nominatim/templates/default/apache.erb +++ b/cookbooks/nominatim/templates/default/apache.erb @@ -28,6 +28,9 @@ 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 ]%>/ @@ -37,7 +40,7 @@ AddHandler fcgi:/var/run/php5-fpm-www.sock .phpx AddHandler fcgi:/var/run/php5-fpm-www.sock .phpj <% end -%> - + <% @pools.each do |name,details| -%> Alias /pool-<%= name %>/ "<%= @directory %>/website/"