nominatim: switch server to new location of nominatim

[chef.git] / cookbooks / gps-tile / templates / default / apache.erb

diff --git a/cookbooks/gps-tile/templates/default/apache.erb b/cookbooks/gps-tile/templates/default/apache.erb
index 7dbd24b41e60a12976050c9858fb6f25bc7e066b..9adf707ddd8cd0325062e79b4b92c873e5fd8782 100644 (file)
--- a/cookbooks/gps-tile/templates/default/apache.erb
+++ b/cookbooks/gps-tile/templates/default/apache.erb
@@ -1,20 +1,17 @@
 # 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>

   # Basic server configuration
   ServerName gps-tile.openstreetmap.org
   ServerAlias *.gps-tile.openstreetmap.org
   ServerAlias gps.tile.openstreetmap.org
   ServerAlias gps-*.tile.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
   # Basic server configuration
   ServerName gps-tile.openstreetmap.org
   ServerAlias *.gps-tile.openstreetmap.org
   ServerAlias gps.tile.openstreetmap.org
   ServerAlias gps-*.tile.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org

-<% if port == 443 -%>

 
   # Enable SSL
   SSLEngine on
   SSLCertificateFile /etc/ssl/certs/gps-tile.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/gps-tile.openstreetmap.org.key
 
   # Enable SSL
   SSLEngine on
   SSLCertificateFile /etc/ssl/certs/gps-tile.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/gps-tile.openstreetmap.org.key

-<% end -%>

 
   # Configure location of static files
   DocumentRoot /srv/gps-tile.openstreetmap.org/html
 
   # Configure location of static files
   DocumentRoot /srv/gps-tile.openstreetmap.org/html


@@ -22,14 +19,11 @@
   # Configure the CGI script that serves the tiles
   ScriptAlias /lines /srv/gps-tile.openstreetmap.org/updater/tile
 
   # Configure the CGI script that serves the tiles
   ScriptAlias /lines /srv/gps-tile.openstreetmap.org/updater/tile
 

-  # Redirect for ACMI challenge validation
-  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-

   # Temporary redirect for old CGI location
   RedirectPermanent /gps-lines/tile /lines
 
   # Setup logging
   # Temporary redirect for old CGI location
   RedirectPermanent /gps-lines/tile /lines
 
   # Setup logging

-  CustomLog /var/log/apache2/access.log combined
+  CustomLog /var/log/apache2/access.log combined_extended

   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 


@@ -38,7 +32,29 @@
   Header set Access-Control-Allow-Origin "*"
 </VirtualHost>
 
   Header set Access-Control-Allow-Origin "*"
 </VirtualHost>
 

-<% end -%>
+<VirtualHost *:80>
+  # Basic server configuration
+  ServerName gps-tile.openstreetmap.org
+  ServerAlias *.gps-tile.openstreetmap.org
+  ServerAlias gps.tile.openstreetmap.org
+  ServerAlias gps-*.tile.openstreetmap.org
+  ServerAdmin webmaster@openstreetmap.org
+
+  # Enable rewriting
+  RewriteEngine On
+
+  # Redirect for ACME challenge validation
+  RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
+
+  # Redirect to https
+  RewriteRule (.*) https://%{SERVER_NAME}/$1 [R=permanent,L]
+
+  # Setup logging
+  CustomLog /var/log/apache2/access.log combined_extended
+  ErrorLog /var/log/apache2/error.log
+  BufferedLogs on
+</VirtualHost>
+

 <Directory /srv/gps-tile.openstreetmap.org/html>
   Options None
   AllowOverride None
 <Directory /srv/gps-tile.openstreetmap.org/html>
   Options None
   AllowOverride None