From 4b29b6ff1888e058e8d6004948317ba587d0a121 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mon, 12 Dec 2016 13:48:11 +0100 Subject: [PATCH] Migrate all the redirect rules from http://pkgs to https://src --- roles/distgit/files/redirect.conf | 72 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/roles/distgit/files/redirect.conf b/roles/distgit/files/redirect.conf index 20f2bbbe2d..d4116a06fd 100644 --- a/roles/distgit/files/redirect.conf +++ b/roles/distgit/files/redirect.conf @@ -1,4 +1,4 @@ -RedirectMatch permanent ^/$ http://pkgs.fedoraproject.org/cgit/ +RedirectMatch permanent ^/$ https://src.fedoraproject.org/cgit/ RewriteEngine on @@ -9,146 +9,146 @@ RewriteRule ^/cgit/(.*)$ /cgit/$1 [L,PT] # blob RewriteCond %{REQUEST_URI} /(.+)(\.git)/blob/(.+)/(.+):/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=blob;h=(.+);hb=(.+);f=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tree/%5?id=%3;id2=%4 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tree/%5?id=%3;id2=%4 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/blob/(.+):/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=blob;hb=(.+);f=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tree/%4?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tree/%4?id=%3 [R,L,NE] RewriteCond %{query_string} p=(.+)(\.git);a=blob;f=(.+);h=(.+);hb=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tree/%3?id=%4;id2=%5 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tree/%3?id=%4;id2=%5 [R,L,NE] RewriteCond %{query_string} p=(.+)(\.git);a=blob;f=(.+);h=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tree/%3?id=%4 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tree/%3?id=%4 [R,L,NE] # tree RewriteCond %{REQUEST_URI} /(.+)(\.git)/tree/(.+)/(.+):/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=tree;h=(.+);hb=(.+);f=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tree/%5?id=%4 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tree/%5?id=%4 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/tree/(.+):/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=tree;hb=(.+);f=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tree/%4?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tree/%4?id=%3 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/tree/(.+)/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=tree;h=(.+);hb=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tree/?id=%4 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tree/?id=%4 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/tree/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=tree;hb=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tree/?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tree/?id=%3 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/tree [OR] RewriteCond %{query_string} p=(.+)(\.git);a=tree -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tree/? [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tree/? [R,L,NE] # commitdiff RewriteCond %{REQUEST_URI} /(.+)(\.git)/commitdiff/(.+)/(.+):/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=blobdiff;h=(.+);hp=(.+);hb=(.+);f=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/diff/%6?id2=%4;id=%3;id3=%5 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/diff/%6?id2=%4;id=%3;id3=%5 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/commitdiff/(.+)/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=commitdiff;h=(.+);hp=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/diff/?id=%4;id2=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/diff/?id=%4;id2=%3 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/commitdiff/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=commitdiff;h=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/diff/?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/diff/?id=%3 [R,L,NE] # commit RewriteCond %{REQUEST_URI} /(.+)(\.git)/commit/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=commit;h=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/commit/?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/commit/?id=%3 [R,L,NE] # summary RewriteCond %{REQUEST_URI} /(.+)(\.git)/summary [OR] RewriteCond %{query_string} p=(.+)(\.git);a=summary -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/? [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/? [R,L,NE] # shortlog RewriteCond %{REQUEST_URI} /(.+)(\.git)/shortlog/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=shortlog;h=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/?id=%3 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/shortlog [OR] RewriteCond %{query_string} p=(.+)(\.git);a=shortlog -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/? [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/? [R,L,NE] # log RewriteCond %{REQUEST_URI} /(.+)(\.git)/log/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=log;h=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/?id=%3 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/log [OR] RewriteCond %{query_string} p=(.+)(\.git);a=log -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log? [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log? [R,L,NE] # history RewriteCond %{REQUEST_URI} /(.+)(\.git)/history/(.+)/(.+):/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=history;h=(.+);hb=(.+);f=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/%5?id=%4 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/%5?id=%4 [R,L,NE] RewriteCond %{query_string} p=(.+)(\.git);a=history;f=(.+);h=(.+);hb=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/%3?id=%4;id2=%5 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/%3?id=%4;id2=%5 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/history/(.+):/(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/%4?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/%4?id=%3 [R,L,NE] RewriteCond %{query_string} p=(.+)(\.git);a=history;f=(.+);h=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/%3?id=%4 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/%3?id=%4 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/history/(.+)/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=history;h=(.+);hb=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/?id=%4 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/?id=%4 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/history/(.+):/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=history;hb=(.+);f=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/%4?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/%4?id=%3 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/history/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=history;hb=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/log/?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/log/?id=%3 [R,L,NE] # tag RewriteCond %{REQUEST_URI} /(.+)(\.git)/tag/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=tag;h=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/tag/?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/tag/?id=%3 [R,L,NE] # blob_plain RewriteCond %{REQUEST_URI} /(.+)(\.git)/blob_plain/(.+):/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=blob_plain;h=(.+);f=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/plain/%4?id=%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/plain/%4?id=%3 [R,L,NE] RewriteCond %{query_string} p=(.+)(\.git);a=blob_plain;f=(.+);hb=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/plain/%3?id2=%4 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/plain/%3?id2=%4 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/blob_plain/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=blob_plain;f=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/plain/%3 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/plain/%3 [R,L,NE] # rss|atom RewriteCond %{REQUEST_URI} /(.+)(\.git)/(rss|atom)/refs/heads/(.+) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=(rss|atom);h=refsheads/(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/atom?h=%4 [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/atom?h=%4 [R,L,NE] RewriteCond %{REQUEST_URI} /(.+)(\.git)/(rss|atom) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=(rss|atom) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/atom? [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/atom? [R,L,NE] # snapshot RewriteCond %{REQUEST_URI} /(.+)(\.git)/snapshot/(.+)(\.tar\.gz|\.tar\.bz2) [OR] RewriteCond %{query_string} p=(.+)(\.git);a=snapshot;h=(.+);sf=(.+) -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/snapshot/%3.tar.gz [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/snapshot/%3.tar.gz [R,L,NE] # base old gitweb project RewriteCond %{REQUEST_URI} /gitweb/(.+)\.git.* [OR] RewriteCond %{query_string} p=(.+)\.git.* -RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/? [R,L,NE] +RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/? [R,L,NE] # Fail safes incase nothing above matches, try at least to put the person in the project #RewriteCond %{REQUEST_URI} /(.+)\.git.* [OR] #RewriteCond %{query_string} p=(.+)\.git.* -#RewriteRule ^/.*$ http://pkgs.fedoraproject.org/cgit/%1.git/? [R,L,NE] +#RewriteRule ^/.*$ https://src.fedoraproject.org/cgit/%1.git/? [R,L,NE] # Or else in the root of cgit -#RewriteRule ^.* http://pkgs.fedoraproject.org/cgit/ [R,L,NE] +#RewriteRule ^.* https://src.fedoraproject.org/cgit/ [R,L,NE]