Merge remote-tracking branch 'github/pull/571'

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

diff --git a/cookbooks/stateofthemap/templates/default/apache.erb b/cookbooks/stateofthemap/templates/default/apache.erb
index cc9005f9a69d1f82706458460eba308e346940a2..7cca3c5a1341bcd5b3344a55ecb99c5e26b762a0 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/apache.erb
+++ b/cookbooks/stateofthemap/templates/default/apache.erb
@@ -3,25 +3,34 @@
 <VirtualHost *:80>
         ServerName stateofthemap.org
         ServerAlias stateofthemap.com
+        ServerAlias sotm.org
         ServerAlias www.stateofthemap.org
         ServerAlias www.stateofthemap.com
+        ServerAlias www.sotm.org
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/stateofthemap.org-access.log combined
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
+        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>
 
 <VirtualHost *:443>
         ServerName stateofthemap.com
+        ServerAlias sotm.org
         ServerAlias www.stateofthemap.org
         ServerAlias www.stateofthemap.com
+        ServerAlias www.sotm.org
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/stateofthemap.org-access.log combined
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
+        SSLEngine on
+        SSLCertificateFile /etc/ssl/certs/stateofthemap.org.pem
+        SSLCertificateKeyFile /etc/ssl/private/stateofthemap.org.key
+
         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>
 
@@ -32,7 +41,16 @@
         CustomLog /var/log/apache2/stateofthemap.org-access.log combined
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
+        SSLEngine on
+        SSLCertificateFile /etc/ssl/certs/stateofthemap.org.pem
+        SSLCertificateKeyFile /etc/ssl/private/stateofthemap.org.key
+
         DocumentRoot /srv/stateofthemap.org/html
+
+        ErrorDocument 404 /404.html
+
+        ExpiresActive On
+        ExpiresDefault "access plus 12 hours"
 </VirtualHost>
 
 <Directory /srv/stateofthemap.org/html>