Revert "Blackhole unreachable Amazon IPv6 block on equinix machines"

[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 7572327c3a48b57d6a5fa602266876916f35ab95..9adf707ddd8cd0325062e79b4b92c873e5fd8782 100644 (file)
--- a/cookbooks/gps-tile/templates/default/apache.erb
+++ b/cookbooks/gps-tile/templates/default/apache.erb
@@ -1,12 +1,18 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-<VirtualHost *:80>
+<VirtualHost *:443>

   # Basic server configuration
   # Basic server configuration

-  ServerName <%= node[:fqdn] %>
-  ServerAlias gps-tile.openstreetmap.org
+  ServerName gps-tile.openstreetmap.org

   ServerAlias *.gps-tile.openstreetmap.org
   ServerAlias *.gps-tile.openstreetmap.org

+  ServerAlias gps.tile.openstreetmap.org
+  ServerAlias gps-*.tile.openstreetmap.org

   ServerAdmin webmaster@openstreetmap.org
 
   ServerAdmin webmaster@openstreetmap.org
 

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

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


@@ -17,7 +23,7 @@
   RedirectPermanent /gps-lines/tile /lines
 
   # Setup logging
   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
 


@@ -26,9 +32,37 @@
   Header set Access-Control-Allow-Origin "*"
 </VirtualHost>
 
   Header set Access-Control-Allow-Origin "*"
 </VirtualHost>
 

+<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

-  Order allow,deny
-  Allow from all
+  Require all granted
+</Directory>
+
+<Directory /srv/gps-tile.openstreetmap.org/updater>
+  <Files tile>
+    Require all granted
+  </Files>

 </Directory>
 </Directory>