[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH] Condense Chronicles rewrite rules, expand to 2022



CC debian-www for awareness.

Please find attached a patch for the dsa-puppet configuration to update the redirect rules for <https://www.debian.org>. On Thomas's request, I have condensed the existing redirect rules to Chronicles down to one.
I've also expanded the pattern to cover News in 2022 which was recently
deleted.

DSA, please wait for Thomas's ACK before merging.

Signed-off-by: Jonathan Dowland <jmtd@debian.org>
---
.../roles/templates/apache-www.debian.org.erb | 49 +------------------
1 file changed, 1 insertion(+), 48 deletions(-)

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index dbdc52527..708786fc7 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -249,54 +249,7 @@
   Redirect /News/2024/20240606 /legal/pocock2

   # Older content moved from www. See: #1109609
-   Redirect /News/1997 https://chronicles.debian.org/www/News/1997
-   Redirect /News/1998 https://chronicles.debian.org/www/News/1998
-   Redirect /News/1999 https://chronicles.debian.org/www/News/1999
-   Redirect /News/2000 https://chronicles.debian.org/www/News/2000
-   Redirect /News/2001 https://chronicles.debian.org/www/News/2001
-   Redirect /News/2002 https://chronicles.debian.org/www/News/2002
-   Redirect /News/2003 https://chronicles.debian.org/www/News/2003
-   Redirect /News/2004 https://chronicles.debian.org/www/News/2004
-   Redirect /News/2005 https://chronicles.debian.org/www/News/2005
-   Redirect /News/2006 https://chronicles.debian.org/www/News/2006
-   Redirect /News/2007 https://chronicles.debian.org/www/News/2007
-   Redirect /News/2008 https://chronicles.debian.org/www/News/2008
-   Redirect /News/2009 https://chronicles.debian.org/www/News/2009
-   Redirect /News/2010 https://chronicles.debian.org/www/News/2010
-   Redirect /News/2011 https://chronicles.debian.org/www/News/2011
-   Redirect /News/2012 https://chronicles.debian.org/www/News/2012
-   Redirect /News/2013 https://chronicles.debian.org/www/News/2013
-   Redirect /News/2014 https://chronicles.debian.org/www/News/2014
-   Redirect /News/2015 https://chronicles.debian.org/www/News/2015
-   Redirect /News/2016 https://chronicles.debian.org/www/News/2016
-   Redirect /News/2017 https://chronicles.debian.org/www/News/2017
-   Redirect /News/2018 https://chronicles.debian.org/www/News/2018
-   Redirect /News/2019 https://chronicles.debian.org/www/News/2019
-   Redirect /News/2020 https://chronicles.debian.org/www/News/2020
-   Redirect /News/2021 https://chronicles.debian.org/www/News/2021
-   Redirect /News/weekly/1999 https://chronicles.debian.org/www/News/weekly/1999
-   Redirect /News/weekly/2000 https://chronicles.debian.org/www/News/weekly/2000
-   Redirect /News/weekly/2001 https://chronicles.debian.org/www/News/weekly/2001
-   Redirect /News/weekly/2002 https://chronicles.debian.org/www/News/weekly/2002
-   Redirect /News/weekly/2003 https://chronicles.debian.org/www/News/weekly/2003
-   Redirect /News/weekly/2004 https://chronicles.debian.org/www/News/weekly/2004
-   Redirect /News/weekly/2005 https://chronicles.debian.org/www/News/weekly/2005
-   Redirect /News/weekly/2006 https://chronicles.debian.org/www/News/weekly/2006
-   Redirect /News/weekly/2007 https://chronicles.debian.org/www/News/weekly/2007
-   Redirect /News/weekly/2008 https://chronicles.debian.org/www/News/weekly/2008
-   Redirect /News/weekly/2009 https://chronicles.debian.org/www/News/weekly/2009
-   Redirect /News/weekly/2010 https://chronicles.debian.org/www/News/weekly/2010
-   Redirect /News/weekly/2011 https://chronicles.debian.org/www/News/weekly/2011
-   Redirect /News/weekly/2012 https://chronicles.debian.org/www/News/weekly/2012
-   Redirect /News/weekly/2013 https://chronicles.debian.org/www/News/weekly/2013
-   Redirect /News/weekly/2014 https://chronicles.debian.org/www/News/weekly/2014
-   Redirect /News/weekly/2015 https://chronicles.debian.org/www/News/weekly/2015
-   Redirect /News/weekly/2016 https://chronicles.debian.org/www/News/weekly/2016
-   Redirect /News/weekly/2017 https://chronicles.debian.org/www/News/weekly/2017
-   Redirect /News/weekly/2018 https://chronicles.debian.org/www/News/weekly/2018
-   Redirect /News/weekly/2019 https://chronicles.debian.org/www/News/weekly/2019
-   Redirect /News/weekly/2020 https://chronicles.debian.org/www/News/weekly/2020
-   Redirect /News/weekly/2021 https://chronicles.debian.org/www/News/weekly/2021
+   RedirectMatch "^/(News(/weekly)?/(19..|200.|201.|202[012]))" "https://chronicles.debian.org/www/$1";

# Upper-case URLs were a bad idea
   Redirect /bugs /Bugs
--
2.47.2


Reply to: