From: Grant Slater <git@firefishy.com>
Date: Sun, 8 Dec 2019 19:51:49 +0000 (+0000)
Subject: switch2osm: add expiry matching github pages
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/57ad18f5ccb73f3285674f8b971036724d4dc73f

switch2osm: add expiry matching github pages
---

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 8ddaf5101..3e0c51f9c 100644
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -25,6 +25,9 @@ package %w[
   zlib1g-dev
 ]
 
+apache_module "expires"
+apache_module "rewrite"
+
 gem_package "bundler" do
   version "1.17.3"
 end
diff --git a/cookbooks/switch2osm/templates/default/apache.erb b/cookbooks/switch2osm/templates/default/apache.erb
index 7d73ca6e4..e355c814c 100644
--- a/cookbooks/switch2osm/templates/default/apache.erb
+++ b/cookbooks/switch2osm/templates/default/apache.erb
@@ -17,6 +17,9 @@
    DocumentRoot <%= @directory %>
 
    ErrorDocument 404 /404.html
+
+   ExpiresActive On
+   ExpiresDefault "access plus 10 minutes"
 </VirtualHost>
 
 <VirtualHost *:80>