It looks like my old fix didn't work because the other rewriterules got processed first. This moves the redirects to a 00redirects.conf file and gets rid of some old redirects along the way. --- configs/web/fedoraproject.org/00redirects.conf | 18 ++++++++++++++ configs/web/fedoraproject.org/modRewrite.conf | 31 ------------------------ 2 files changed, 18 insertions(+), 31 deletions(-) create mode 100644 configs/web/fedoraproject.org/00redirects.conf delete mode 100644 configs/web/fedoraproject.org/modRewrite.conf diff --git a/configs/web/fedoraproject.org/00redirects.conf b/configs/web/fedoraproject.org/00redirects.conf new file mode 100644 index 0000000..7d29896 --- /dev/null +++ b/configs/web/fedoraproject.org/00redirects.conf @@ -0,0 +1,18 @@ +RewriteEngine On + +RewriteCond %{HTTP_USER_AGENT} ^BackStreet.* +RewriteRule ^.*$ / [R,L] + +#RewriteRule ^/wiki/Category.*$ http://fedoraproject.org/404.html +#RewriteRule ^/wiki/TitleIndex$ http://fedoraproject.org/404.html +RewriteRule ^/CodecBuddy http://fedoraproject.org/wiki/CodecBuddy [NC] +RewriteRule ^/wiki$ http://fedoraproject.org/wiki/ +RewriteRule ^/people$ http://fedoraproject.org/people/ +RewriteRule ^/soc.*$ http://fedoraproject.org/wiki/SummerOfCode [R=permanent,L] +RewriteRule ^/docs/(.*) http://docs.fedoraproject.org/$1 [R=301,L] +RewriteRule ^/([^/]+/)?legal/trademarks/guidelines$ http://fedoraproject.org/wiki/Legal:Trademark_guidelines [R=301,L] +RedirectMatch ^/buildgroups/(.*)$ http://buildsys.fedoraproject.org/buildgroups/$1 + +# Temporary redirect for get-prerelease - remove for F12 prereleases. +RewriteRule ^(/.*)?/get-prerelease$ $1/get-fedora [R=302] + diff --git a/configs/web/fedoraproject.org/modRewrite.conf b/configs/web/fedoraproject.org/modRewrite.conf deleted file mode 100644 index 776d83e..0000000 --- a/configs/web/fedoraproject.org/modRewrite.conf +++ /dev/null @@ -1,31 +0,0 @@ -RewriteEngine On - - -RewriteCond %{HTTP_USER_AGENT} ^BackStreet.* -RewriteRule ^.*$ / [R,L] - -#RewriteRule ^/wiki/Category.*$ http://fedoraproject.org/404.html -#RewriteRule ^/wiki/TitleIndex$ http://fedoraproject.org/404.html -RewriteRule ^/CodecBuddy http://fedoraproject.org/wiki/CodecBuddy [NC] -#RewriteRule ^/$ http://fedoraproject.org/wiki/ -RewriteRule ^/wiki$ http://fedoraproject.org/wiki/ -RewriteRule ^/people$ http://fedoraproject.org/people/ -RewriteRule ^/soc.*$ http://fedoraproject.org/wiki/SummerOfCode [R=permanent,L] -RewriteRule ^/docs/(.*) http://docs.fedoraproject.org/$1 [R=301,L] -RewriteRule ^/Download/(.*) http://rhold.fedoraproject.org/Download/$1 [R=301,L] -RewriteRule ^/download/(.*) http://rhold.fedoraproject.org/Download/$1 [R=301,L] -RewriteRule ^/extras/(.*) http://download.fedora.redhat.com/pub/fedora/linux/extras/$1 [R=302,L] -RewriteRule ^/([^/]+/)?legal/trademarks/guidelines$ http://fedoraproject.org/wiki/Legal:Trademark_guidelines [R=301,L] -# RedirectMatch ^/wiki/Releases/7 http://fedoraproject.org/static-tmp/7 -# RedirectMatch ^/wiki/$ http://fedoraproject.org/static-tmp/ -# RedirectMatch ^/wiki/FedoraMain$ http://fedoraproject.org/static-tmp/ -# RedirectMatch ^/wiki/Infrastructure/Downtime$ http://fedoraproject.org/static-tmp/FedoraDowntime.html -# RedirectMatch ^/wiki/Mirrors$ http://fedoraproject.org/static-tmp/FedoraMirrors.html -# RedirectMatch ^/wiki/FC6ReleaseSummary$ http://fedoraproject.org/static-tmp/FC6ReleaseSummary.html -# RedirectMatch ^/wiki/Tours/FedoraCore6$ http://fedoraproject.org/static-tmp/FedoraCore6.html -# RedirectMatch ^/.+$ http://fedoraproject.org/wiki/ -RedirectMatch ^/buildgroups/(.*)$ http://buildsys.fedoraproject.org/buildgroups/$1 - -# Temporary redirect for get-prerelease - remove for F12 prereleases. -RewriteRule ^(/.*)?/get-prerelease$ $1/get-fedora [R=302] - -- 1.5.5.6
Attachment:
pgp2TIRj0w3nu.pgp
Description: PGP signature
_______________________________________________ Fedora-infrastructure-list mailing list Fedora-infrastructure-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-infrastructure-list