Bump cookstyle from 7.21.0 to 7.22.3

[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 7ed9d9251c6456ea51269c1988c0b1fabb081d6e..7cca3c5a1341bcd5b3344a55ecb99c5e26b762a0 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/apache.erb
+++ b/cookbooks/stateofthemap/templates/default/apache.erb
@@ -3,8 +3,10 @@
 <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
@@ -16,8 +18,10 @@
 
 <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
@@ -42,6 +46,11 @@
         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>