nominatim: move to nginx for webserving

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

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
deleted file mode 100644 (file)
index 46aa2d8..0000000
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ /dev/null
@@ -1,87 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-<VirtualHost *:443>
-    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
-
-    # Enable SSL
-    SSLEngine on
-    SSLProxyEngine on
-    SSLCertificateFile /etc/ssl/certs/<%= node[:fqdn] %>.pem
-    SSLCertificateKeyFile /etc/ssl/private/<%= node[:fqdn] %>.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 <%= 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
-        Require all granted
-    </Directory>
-
-    ProxyPassMatch ^/([^/]*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
-
-    <% @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 -%>
-
-    Redirect 429 /pool-block/
-    ErrorDocument 429 /509.html
-    <Location /pool-block>
-        ErrorDocument 429 /509.html
-    </Location>
-    Redirect 403 /pool-ban/
-    <Location /pool-ban>
-        ErrorDocument 403 /403.html
-    </Location>
-    ErrorDocument 403 /403.html
-
-    RewriteEngine On
-
-    # manual blocks
-    Include <%= @directory %>/settings/apache_blocks.conf
-
-    # regular requests and autoblocks
-    RewriteMap bulklist txt:<%= @directory %>/settings/ip_blocks.map
-    RewriteRule ^/(search|reverse|lookup|details)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT]
-</VirtualHost>
-
-<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
-
-    RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
-
-    RewriteCond %{REQUEST_URI} !^/server-status$
-    RewriteRule ^(.*)$ https://nominatim.openstreetmap.org$1 [L,NE,R=permanent]
-</VirtualHost>