From 8a2c31a09133358ec6d85b2c458bfb7f36a1a7be Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 5 Jul 2019 07:28:23 +0200 Subject: [PATCH] Permanent redirects mean we can never, ever change them again as they might be cached. Stop doing those. --- .../vhost/static-vhosts-simple.erb | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb index 16ca9b915..bbf12bf83 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -66,7 +66,7 @@ # Rewrite away double slashes RewriteEngine on RewriteCond %{REQUEST_URI} ^(.*)//(.*)$ [NC] - RewriteRule . %1/%2 [R=301,L,NE] + RewriteRule . %1/%2 [L,NE] ForceType text/plain @@ -140,8 +140,8 @@ RewriteMap source-map txt:/srv/static.debian.org/mirrors/lintian.debian.org/cur/lookup-tables/source-packages # Re-direct from the "old" locations to the new ones - RewriteRule ^/reports/T(.*)\.html$ /tags/$1.html [L,R=permanent] - RewriteRule ^/reports/(.*)$ /$1 [L,R=permanent] + RewriteRule ^/reports/T(.*)\.html$ /tags/$1.html [L] + RewriteRule ^/reports/(.*)$ /$1 [L] # Map source packages to reports (this mapping is re-written once per lintian run, # serve it as a 302 rather than a permanent redirect) @@ -165,8 +165,8 @@ RewriteEngine on - RewriteRule ^/$ /wiki/Main_Page [L,R=permanent] - RewriteRule ^/wiki/$ /wiki/Main_Page [L,R=permanent] + RewriteRule ^/$ /wiki/Main_Page [L] + RewriteRule ^/wiki/$ /wiki/Main_Page [L] RewriteCond %{QUERY_STRING} (^|&)modules=mediawiki.legacy.commonPrint,shared|skins.monobook(&|$) RewriteCond %{QUERY_STRING} (^|&)only=styles(&|$) @@ -208,17 +208,17 @@ RewriteEngine On # A few redirects for older debconf sites, so old links work - RewriteRule ^/gallery/(.*)$ https://gallery.debconf.org/v/$1 [R=permanent,L] - RewriteRule ^/.*years$ https://10years.debconf.org/ [R=permanent,L] - RewriteRule ^/debconf2$ https://debconf2.debconf.org/ [R=permanent,L] - RewriteRule ^/debconf3$ https://debconf3.debconf.org/ [R=permanent,L] - RewriteRule ^/debconf4$ https://debconf4.debconf.org/ [R=permanent,L] - RewriteRule ^/debconf5$ https://debconf5.debconf.org/ [R=permanent,L] - RewriteRule ^/10years/(.*)$ https://10years.debconf.org/$1 [R=permanent,L] - RewriteRule ^/debconf2/(.*)$ https://debconf2.debconf.org/$1 [R=permanent,L] - RewriteRule ^/debconf3/(.*)$ https://debconf3.debconf.org/$1 [R=permanent,L] - RewriteRule ^/debconf4/(.*)$ https://debconf4.debconf.org/$1 [R=permanent,L] - RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [R=permanent,L] + RewriteRule ^/gallery/(.*)$ https://gallery.debconf.org/v/$1 [L] + RewriteRule ^/.*years$ https://10years.debconf.org/ [L] + RewriteRule ^/debconf2$ https://debconf2.debconf.org/ [L] + RewriteRule ^/debconf3$ https://debconf3.debconf.org/ [L] + RewriteRule ^/debconf4$ https://debconf4.debconf.org/ [L] + RewriteRule ^/debconf5$ https://debconf5.debconf.org/ [L] + RewriteRule ^/10years/(.*)$ https://10years.debconf.org/$1 [L] + RewriteRule ^/debconf2/(.*)$ https://debconf2.debconf.org/$1 [L] + RewriteRule ^/debconf3/(.*)$ https://debconf3.debconf.org/$1 [L] + RewriteRule ^/debconf4/(.*)$ https://debconf4.debconf.org/$1 [L] + RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [L] -- 2.20.1