diff --git a/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf b/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf index 492b8ee70d..abcb3988b6 100644 --- a/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf +++ b/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf @@ -5,6 +5,15 @@ RewriteRule ^.*$ https://fedoraproject.org/wiki/Infrastructure/Mirroring#Tools_t RewriteRule ^/$ /pub [R=302,L] + +# This is to deal with a broken ostree (actually libcurl) that doesn't work well with ostree +# The only remaining image with this bug is F27 Fedora Atomic Workstation +# Can be nuked after F28 GA +RewriteEngine On +RewriteCond %{HTTP_USER_AGENT} ^ostree$ +RewriteRule ^/ostree/27/(.*)$ http://brokenostreekojipkgs.fedoraproject.org/ostree/27/$1 [L,R=302] + + RedirectMatch 302 ^/pub/fedora/linux/atomic/(.*$) https://kojipkgs.fedoraproject.org/atomic/$1 RedirectMatch 302 ^/pub/fedora/linux/atomic https://kojipkgs.fedoraproject.org/atomic/ Redirect 302 "/ostree/27" "https://kojipkgs.fedoraproject.org/atomic/repo" diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf index 8d1e62f15c..c47da108d2 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf @@ -17,13 +17,6 @@ RequestHeader unset Expect early ProxyPreserveHost On {% endif %} -# This is to deal with a broken ostree (actually libcurl) that doesn't work well with ostree -# The only remaining image with this bug is F27 Fedora Atomic Workstation -# Can be nuked after F28 GA -RewriteEngine On -RewriteCond %{HTTP_USER_AGENT} ^ostree\ $ -RewriteRule ^/ostree/27/(.*)$ http://brokenostreekojipkgs.fedoraproject.org/ostree/27/$1 [L,R=302] - {% if 'phx2' in inventory_hostname %}