X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c05f38004a026509d99b5f2350bfeb021e44fc42..95e1e4603eb8c32acf8ee58c845ec4ce5bfdd56c:/cookbooks/nominatim/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb index 230063643..d14a5c8ed 100644 --- a/cookbooks/nominatim/templates/default/apache.erb +++ b/cookbooks/nominatim/templates/default/apache.erb @@ -16,6 +16,7 @@ # Enable SSL # SSLEngine on + SSLProxyEngine on <% end -%> CustomLog /var/log/apache2/nominatim.openstreetmap.org-access.log combined @@ -32,6 +33,9 @@ <% @pools.each do |name,details| -%> Alias /pool-<%= name %>/ "<%= @directory %>/website/" + <% node[:nominatim][:redirects].each do |url,host| -%> + ProxyPassMatch ^/pool-<%= name %>/(<%= url %>\.php(/.*)?) http<% if port == 443 -%>s<% end -%>://<%= host %>/pool-<%= name %>/$1 + <% end -%> ProxyPassMatch ^/pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1 <% end -%> @@ -53,7 +57,7 @@ # regular requests and autoblocks RewriteMap bulklist txt:<%= @directory %>/settings/ip_blocks.map - RewriteRule ^/(search|reverse|details)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT] + RewriteRule ^/(search|reverse|details|lookup)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT]