mailman: extend year regex

[chef.git] / cookbooks / mailman / templates / default / apache.erb

diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 0f0e9a9598ef243c4157886e5bc7ce4db7c4653c..af2e59cc270c197d7aa36a40d13f25c0b75c2946 100644 (file)
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -58,9 +58,6 @@
   RedirectMatch ^/$ /listinfo
   RedirectMatch ^/cgi-bin/mailman/(.*)$ /$1
 
-  # Redact list archive entries pending moderator review
-  RedirectMatch 451 ^/pipermail/talk/2022-July/(087645|087647)\.html$
-
   <Directory /var/lib/mailman/archives/>
          Options Indexes FollowSymLinks
     AllowOverride None
@@ -84,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|2018)">
+  <Location ~ "/pipermail/([^/]+)/(2004|2005|2006|2007|2008|2009|2010|2011|2012|2013|2014|2015|2016|2017|2018|2019|2020|2021)">
     ExpiresActive On
     ExpiresDefault "access plus 180 days"
   </Location>