From 0947c0f3a5fc3e4169570f906202e295efa8a3c1 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 11 Apr 2018 12:30:10 -0400 Subject: [PATCH] Move the redirect to dl.fp.o Signed-off-by: Patrick Uiterwijk --- roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf | 3 +++ .../reverseproxy/templates/reversepassproxy.kojipkgs.conf | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf b/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf index cd5be33724..2aabe0924a 100644 --- a/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf +++ b/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf @@ -10,3 +10,6 @@ RedirectMatch 302 ^/pub/fedora/linux/atomic https://kojipkgs.fedoraproject.org/a Redirect 302 "/ostree/27" "https://kojipkgs.fedoraproject.org/atomic/repo" Redirect 302 "/pub/ostree/27" "https://kojipkgs.fedoraproject.org/atomic/repo" +Redirect 302 "/atomic/repo" "https://kojipkgs.fedoraproject.org/atomic/repo" +RewriteCond %{HTTP:X-CloudFront} !^$ +RewriteRule "/atomic/repo/objects/(.*)" "https://d2os45suu8yck8.cloudfront.net/$1" [R=302,L] diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf index 6b8d943969..e7d258a722 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf @@ -34,7 +34,3 @@ ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} {% else %} Redirect 421 / {% endif %} - -# Atomic Objects -RewriteCond %{HTTP:X-CloudFront} !^$ -RewriteRule "/atomic/repo/objects/(.*)" "https://d2os45suu8yck8.cloudfront.net/$1" [R=302,L]