On Mon, May 18, 2015 at 11:04:45AM +0200, Pierre-Yves Chibon wrote: > On Mon, May 18, 2015 at 09:23:06AM +0200, Adrian Reber wrote: > > 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. > > > > i agree with the change proposed below, +1 > > However, we could backport the pull-request above on the top of 1.0 and release > a fixed RPM or we could cut a 1.1 release but there are more changes in the > pipes: > > * Include the background header image in the fedora template directly (instead > of calling it from koji) > * Mark always up to date hosts as up to date, even when unreachable > * Rework the crawler with the introduction of the canary mode (among other) > * Adjust spec file to follow the systemd packaging guidelines > * Offer possibility to sort by product (that's the change described above) > > The first two changes seem harmless to me, the last two are also ok but I fear > the change in the crawler might be a little big to put in a freeze-break. > > So this considered, I guess I am more in favor of backporting the change as a > patch and do a 1.0.0-2 RPM release. I would also not deploy the crawler changes during the freeze. I am also in favour of backporting the mentioned changes (without the crawler changes) Adrian > > commit fbe4525cf4b2589b3f44ad59429dd8625b4b5600 > > Author: Adrian Reber <adrian@xxxxxxxx> > > 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>
Attachment:
pgpWnnuImg66q.pgp
Description: PGP signature
_______________________________________________ infrastructure mailing list infrastructure@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/infrastructure
