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

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

diff --git a/cookbooks/stateofthemap/templates/default/apache.jekyll.erb b/cookbooks/stateofthemap/templates/default/apache.jekyll.erb
index 005996b11983c05e40c26bb6d35b8721f806b0cc..504003df60a9bbe221d8f8c97bc197db7bf4f720 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/apache.jekyll.erb
+++ b/cookbooks/stateofthemap/templates/default/apache.jekyll.erb
@@ -39,6 +39,11 @@
         SSLCertificateKeyFile /etc/ssl/private/<%= @year %>.stateofthemap.org.key
 
         DocumentRoot /srv/<%= @year %>.stateofthemap.org/_site
         SSLCertificateKeyFile /etc/ssl/private/<%= @year %>.stateofthemap.org.key
 
         DocumentRoot /srv/<%= @year %>.stateofthemap.org/_site

+
+        ErrorDocument 404 /404.html
+
+        ExpiresActive On
+        ExpiresDefault "access plus 10 minutes"

 </VirtualHost>
 
 <Directory /srv/<%= @year %>.stateofthemap.org/_site>
 </VirtualHost>
 
 <Directory /srv/<%= @year %>.stateofthemap.org/_site>