From 926b12b2a5ae54e1878beadb724df2829cf7eeaf Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 17 Jan 2025 11:05:47 +0100 Subject: [PATCH] Move registry redirects rules to reverseproxy --- roles/fedora-web/main/files/redirects.conf.prod | 4 ---- .../templates/reversepassproxy.registry-generic.conf | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/fedora-web/main/files/redirects.conf.prod b/roles/fedora-web/main/files/redirects.conf.prod index d44da97bc0..808b3fb7b0 100644 --- a/roles/fedora-web/main/files/redirects.conf.prod +++ b/roles/fedora-web/main/files/redirects.conf.prod @@ -27,7 +27,3 @@ RewriteRule ^/([^/]+/)?(keys|verify)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301, RewriteCond %{HTTP_REFERER} .*fedorproject.* RewriteRule .* http://mmcgrath.fedorapeople.org/spam.html [R=301,L] - -# registry.fedoraproject.org web interface previously served by reg-server -RewriteCond %{HTTP_HOST} ^registry\.fedoraproject\.org$ -RewriteRule ^(index\.html|repo(.)*)?$ https://quay.io/organization/fedora/ [R=301,L] diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf index c0d822d36d..ba1ee24c05 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf @@ -23,6 +23,10 @@ RewriteCond expr "! -R '10.3.171.0/24'" RewriteRule ^/v2/(.*)/blobs/([a-zA-Z0-9:]*) https://cdn.registry.fedoraproject.org/v2/$1/blobs/$2 [R] {% endif %} +# registry.fedoraproject.org web interface previously served by reg-server +RewriteCond %{HTTP_HOST} ^registry\.fedoraproject\.org$ +RewriteRule ^(index\.html|repo(.)*)?$ https://quay.io/organization/fedora/ [R=301,L] + # This is terible, but Docker. RewriteCond %{REQUEST_METHOD} ^(PATCH|POST|PUT|DELETE)$ {% if env == "production" %}