From: Grant Slater <git@firefishy.com>
Date: Tue, 22 Jan 2019 23:32:12 +0000 (+0000)
Subject: mailman: Fix debian image + add 2018
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/168464f5c9efa9b813c70269c8af772f63c9c76c?ds=sidebyside

mailman: Fix debian image + add 2018
---

diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 8c22b3f1d..d2c0aab91 100644
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -65,6 +65,7 @@
   </Directory>
 
   Alias /pipermail/ /var/lib/mailman/archives/public/
+  Alias /images/mailman/ /usr/share/images/mailman/
   Alias /images/ /usr/share/images/mailman/
 
   ScriptAlias /admin /usr/lib/cgi-bin/mailman/admin
@@ -80,7 +81,7 @@
   ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
   ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
 
-  <Location ~ "/pipermail/([^/]+)/(2004|2005|2006|2007|2008|2009|2010|2011|2012|2013|2014|2015|2016|2017)">
+  <Location ~ "/pipermail/([^/]+)/(2004|2005|2006|2007|2008|2009|2010|2011|2012|2013|2014|2015|2016|2017|2018)">
     ExpiresActive On
     ExpiresDefault "access plus 180 days"
   </Location>