Freeze Break Request - fix redirect publiclist -> mirrormanager (part 2)

[Adrian Reber]

I am not sure if this is necessary, but searching for
'publiclist fedora 20' returns following link:

http://mirrors.fedoraproject.org/publiclist/Fedora/20/

which is currently not correctly rewritten/redirected to

https://admin.fedoraproject.org/mirrormanager/mirrors/Fedora/20

The following patch fixes the rewrite (tested in staging). For full MM1
compatibility additional code changes are required:

https://github.com/fedora-infra/mirrormanager2/pull/76

Without the above PR URLs like

http://mirrors.fedoraproject.org/publiclist/Fedora
http://mirrors.fedoraproject.org/publiclist/EPEL

are not correctly rewritten/redirected. So I am not sure if this should
also be applied as a hotfix.

Can I get two +1 for the apache rewrite changes? And maybe some feedback
if we need the changes from the PR mentioned above.

		Adrian


commit fbe4525cf4b2589b3f44ad59429dd8625b4b5600
Author: Adrian Reber <adrian at lisas.de>
Date:   Fri May 15 21:06:18 2015 +0000

    Add rewrite rule to access specific parts of the mirrorlist
    
    The MM1 publiclist links are supposed to still work. If an old
    publiclist link tries to directly access a product/version or
    product/version/arch combination an additional 'mirrors' needs to be
    inserted into the link. For full MM1 compatibility following PR is
    necessary:
    
    https://github.com/fedora-infra/mirrormanager2/pull/76

diff --git a/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf b/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
index 8ac75b2..5b877ae 100644
--- a/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
+++ b/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
@@ -3,9 +3,13 @@
 #
 {% if env == "staging" %}
 Redirect /publiclist https://admin.stg.fedoraproject.org/mirrormanager
+RewriteEngine On
+RewriteRule ^/publiclist/(.+[^/])/?$ https://admin.stg.fedoraproject.org/mirrormanager/mirrors/$1 [R,L]
 {% else %}
 Redirect /publiclist https://admin.fedoraproject.org/mirrormanager
 Alias /static /var/lib/mirrormanager/mirrorlists/static/
+RewriteEngine On
+RewriteRule ^/publiclist/(.+[^/])/?$ https://admin.fedoraproject.org/mirrormanager/mirrors/$1 [R,L]
 {% endif %}
 
 <Directory /var/lib/mirrormanager/mirrorlists>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: not available
URL: <http://lists.fedoraproject.org/pipermail/infrastructure/attachments/20150518/cd74289f/attachment.sig>