Freeze Break Request - fix redirect publiclist -> mirrormanager

[Adrian Reber]

    There have been reports that the old links pointing to the mirrorlist
    are no longer working:
    
     $ curl -I http://mirrors.fedoraproject.org/publiclist/
     Location: https://admin.fedoraproject.org/mirrormanager///
    
    This redirect still works but trying to access a specific mirrorlist
    fails:
    
     $ curl -I http://mirrors.fedoraproject.org/publiclist/EPEL/7/
     Location: https://admin.fedoraproject.org/mirrormanager///EPEL/7/
     $ curl -I https://admin.fedoraproject.org/mirrormanager///EPEL/7/
     HTTP/1.1 404 NOT FOUND
    
    At different places there are just too many slashes added. Removing the
    slashes seems to help.

    I have tested the mirrorlist part in staging but I have not tested
    the reverse proxy part.

    In addition the wiki probably also needs to be adapted:
    https://fedoraproject.org/wiki/EPEL points to
    http://mirrors.fedoraproject.org/publiclist/EPEL/ which no longer
    exists.

< peters-tx> Re-cross posting from #fedora and #rhel --  "Mirrorlist" at
             EPEL on Fedora looks broken -- https://fedoraproject.org/wiki/EPEL -->
             http://mirrors.fedoraproject.org/publiclist/EPEL/
< peters-tx> http://mirrors.fedoraproject.org/publiclist/EPEL/
             redirects to  https://admin.fedoraproject.org/mirrormanager///EPEL/
             which is "Not Found"...  
             https://admin.fedoraproject.org/mirrormanager/EPEL
             is also "Not Found"

Can I get two +1 for these changes?

		Adrian


diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.mirrormanager-mirrorlist.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.mirrormanager-mirrorlist.conf
index f151d02..cf02aa0 100644
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.mirrormanager-mirrorlist.conf
+++ b/roles/httpd/reverseproxy/templates/reversepassproxy.mirrormanager-mirrorlist.conf
@@ -24,7 +24,7 @@ RewriteRule ^/mirrorlist - [F]
 # END hack
 
 RewriteRule ^/static/(.*) {{proxyurl}}/static/$1 [P,L]
-RewriteRule ^/publiclist(.*) {{proxyurl}}/publiclist/$1 [P,L]
+RewriteRule ^/publiclist(.*) {{proxyurl}}/publiclist$1 [P,L]
 RewriteRule ^/mirrorlist(.*) {{proxyurl}}/mirrorlist$1 [P,L]
 RewriteRule ^/metalink(.*) {{proxyurl}}/metalink$1 [P,L]
 RewriteRule ^/$ /publiclist/ [R,L]
diff --git a/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf b/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
index 7437b7a..1d430d3 100644
--- a/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
+++ b/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
@@ -4,7 +4,7 @@
 {% if env == "staging" %}
 Redirect /publiclist https://admin.stg.fedoraproject.org/mirrormanager
 {% else %}
-Redirect /publiclist https://admin.fedoraproject.org/mirrormanager/
+Redirect /publiclist https://admin.fedoraproject.org/mirrormanager
 Alias /static /var/lib/mirrormanager/mirrorlists/static/
 {% endif %}
-------------- 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/20150515/b2ca7a6d/attachment.sig>