mailman: Fix debian image + add 2018

diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 8c22b3f1d9f7277d5f8b5113032077bf30e12b23..d2c0aab91a71b8093c341a8137d3feaa8c970d3d 100644 (file)
--- 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/
   </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
   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/
 
   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>
     ExpiresActive On
     ExpiresDefault "access plus 180 days"
   </Location>