From 74c772f99fe8b4ab015aaac0e249c4f03d18259c Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 15 May 2015 07:21:31 +0000 Subject: [PATCH] Fix redirect from publiclist to mirrormanager. 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. --- .../templates/reversepassproxy.mirrormanager-mirrorlist.conf | 2 +- .../mirrorlist2/templates/mirrorlist-server.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.mirrormanager-mirrorlist.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.mirrormanager-mirrorlist.conf index f151d02583..cf02aa09c1 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 7437b7a96a..8ac75b22e0 100644 --- a/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf +++ b/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf @@ -2,9 +2,9 @@ # mirrormanager2 moves the publiclist web page to the frontend server # {% if env == "staging" %} -Redirect /publiclist https://admin.stg.fedoraproject.org/mirrormanager2/ +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 %}