From 4bac7add693fe392c50a52d335d22bd962ed2ce3 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 11 Apr 2018 16:27:20 +0000 Subject: [PATCH 1/5] of course you need facts. --- playbooks/manual/get-system-packages.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/playbooks/manual/get-system-packages.yml b/playbooks/manual/get-system-packages.yml index 8f7f27c974..98079635c3 100644 --- a/playbooks/manual/get-system-packages.yml +++ b/playbooks/manual/get-system-packages.yml @@ -4,15 +4,9 @@ - name: Get installed packages hosts: builders:releng-compose:data-analysis01.phx2.fedoraproject.org - gather_facts: false + gather_facts: true user: root - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" - - tasks: - name: yum_command From 0947c0f3a5fc3e4169570f906202e295efa8a3c1 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 11 Apr 2018 12:30:10 -0400 Subject: [PATCH 2/5] 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] From 0fae543a84e3fd64c4ed867b56aa52a4baf1944c Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 11 Apr 2018 12:42:01 -0400 Subject: [PATCH 3/5] Reorder these Signed-off-by: Patrick Uiterwijk --- roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf b/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf index 2aabe0924a..accce5db7b 100644 --- a/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf +++ b/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf @@ -10,6 +10,7 @@ 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] + +Redirect 302 "/atomic/repo" "https://kojipkgs.fedoraproject.org/atomic/repo" From 63b3d2b45b5de6c1404d706e7cb5004eca7a7e06 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 11 Apr 2018 12:50:36 -0400 Subject: [PATCH 4/5] Only use RedirecftMatch Signed-off-by: Patrick Uiterwijk --- .../download/files/httpd/dl.fedoraproject.org/rewrite.conf | 6 ++---- 1 file changed, 2 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 accce5db7b..e8f32af6c2 100644 --- a/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf +++ b/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf @@ -10,7 +10,5 @@ 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" -RewriteCond %{HTTP:X-CloudFront} !^$ -RewriteRule "/atomic/repo/objects/(.*)" "https://d2os45suu8yck8.cloudfront.net/$1" [R=302,L] - -Redirect 302 "/atomic/repo" "https://kojipkgs.fedoraproject.org/atomic/repo" +RedirectMatch 302 ^/atomic/repo/objects https://d2os45suu8yck8.cloudfront.net/$1 +RedirectMatch 302 ^/atomic/repo https://kojipkgs.fedoraproject.org/atomic/repo From 7dc3db314110e14e8a47ded9d85b42afedef27f3 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 11 Apr 2018 15:04:29 -0400 Subject: [PATCH 5/5] Redirect with Signed-off-by: Patrick Uiterwijk --- roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf b/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf index e8f32af6c2..492b8ee70d 100644 --- a/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf +++ b/roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf @@ -10,5 +10,5 @@ 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" -RedirectMatch 302 ^/atomic/repo/objects https://d2os45suu8yck8.cloudfront.net/$1 -RedirectMatch 302 ^/atomic/repo https://kojipkgs.fedoraproject.org/atomic/repo +RedirectMatch 302 ^/atomic/repo/objects/(.*) https://d2os45suu8yck8.cloudfront.net/$1 +RedirectMatch 302 ^/atomic/repo/(.*) https://kojipkgs.fedoraproject.org/atomic/repo/$1