Search rank for new namespace

[chef.git] / cookbooks / nominatim / templates / default / apache.erb

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 4c16dcf4f22c26ede9c566add006dcd5988ac071..9d29290e817f050441ecaffe10469a50e9588457 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -1,67 +1,51 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-<% [80, 443].each do |port| -%>
-<VirtualHost *:<%= port %>>
+<VirtualHost *:443>

     ServerName <%= node[:fqdn] %>
     ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.osm.org
     ServerName <%= node[:fqdn] %>
     ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.osm.org

-    ServerAlias nominatim.openstreetmap.org
+    ServerAlias nominatim.openstreetmap.com

     ServerAlias nominatim.openstreetmap.net
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.org
     ServerAdmin webmaster@openstreetmap.org
 
     ServerAlias nominatim.openstreetmap.net
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.org
     ServerAdmin webmaster@openstreetmap.org
 

-<% if port == 443 -%>
-    #

     # Enable SSL
     # Enable SSL

-    #

     SSLEngine on
     SSLEngine on

-<% end -%>
+    SSLProxyEngine on
+    SSLCertificateFile /etc/ssl/certs/nominatim.openstreetmap.org.pem
+    SSLCertificateKeyFile /etc/ssl/private/nominatim.openstreetmap.org.key
+
+    # Remove Proxy request header to mitigate https://httpoxy.org/
+    RequestHeader unset Proxy early
+
+    RequestReadTimeout header=15-30,MinRate=500 body=15-30,MinRate=500

 
 

-    CustomLog /var/log/apache2/nominatim.openstreetmap.org-access.log combined
+    CustomLog <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log combined

     ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log
 
     DocumentRoot <%= @directory %>/website
     <Directory "<%= @directory %>/website/">
         DirectoryIndex search.php
         Options FollowSymLinks
     ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log
 
     DocumentRoot <%= @directory %>/website
     <Directory "<%= @directory %>/website/">
         DirectoryIndex search.php
         Options FollowSymLinks

-<% if node[:lsb][:release].to_f >= 14.04 -%>

         Require all granted
         Require all granted

-<% end -%>

     </Directory>
 
     </Directory>
 

-<% if node[:lsb][:release].to_f >= 14.04 -%>
-    ProxyPassMatch /((?!pool-.*).*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
-<% else -%>
-    <LocationMatch /((?!pool-.*).*\.php(/.*)?)$>
-        SetHandler fcgi:/var/run/php5-fpm-www.sock
-    </LocationMatch>
-<% end -%>
+    ProxyPassMatch ^/([^/]*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1

 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"

-<% if node[:lsb][:release].to_f >= 14.04 -%>
-    ProxyPassMatch /pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1
-<% else -%>
-    <LocationMatch /pool-<%= name %>/(.*\.php(/.*)?)$>
-        SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock
-    </LocationMatch>
-<% end -%>
+    <% 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 -%>
 
     <% end -%>
 

-<% if node[:lsb][:release].to_f >= 14.04 -%>

     Redirect 429 /pool-block/
     ErrorDocument 429 /509.html
     <Location /pool-block>
         ErrorDocument 429 /509.html
     </Location>
     Redirect 429 /pool-block/
     ErrorDocument 429 /509.html
     <Location /pool-block>
         ErrorDocument 429 /509.html
     </Location>

-<% else -%>
-    Redirect 420 /pool-block/
-    ErrorDocument 420 /509.html
-    <Location /pool-block>
-        ErrorDocument 420 /509.html
-    </Location>
-<% end -%>

     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html
     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html


@@ -75,8 +59,28 @@
 
     # regular requests and autoblocks
     RewriteMap bulklist txt:<%= @directory %>/settings/ip_blocks.map
 
     # 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|lookup)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT]
+    RewriteRule ^/details(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|details}/details.php$2 [PT]

 </VirtualHost>
 
 </VirtualHost>
 

-<% end -%>
+<VirtualHost *:80>
+    ServerName <%= node[:fqdn] %>
+    ServerAlias nominatim.openstreetmap.org
+    ServerAlias nominatim.osm.org
+    ServerAlias nominatim.openstreetmap.com
+    ServerAlias nominatim.openstreetmap.net
+    ServerAlias nominatim.openstreetmaps.org
+    ServerAlias nominatim.openmaps.org
+    ServerAdmin webmaster@openstreetmap.org
+
+    CustomLog <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log combined
+    ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log
+
+    RewriteEngine On
+
+    # manual blocks
+    Include <%= @directory %>/settings/apache_blocks.conf
+
+    RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+    RedirectPermanent / https://nominatim.openstreetmap.org/
+</VirtualHost>