From 1fd68137c6ece37418eb05c6efb2e3139bac766e Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Fri, 3 Apr 2020 20:18:11 +0000 Subject: [PATCH] 15th time is the charm --- playbooks/include/proxies-redirects.yml | 9 +-------- playbooks/include/proxies-rewrites.yml | 6 ++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index 5221275693..69189de558 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -562,17 +562,10 @@ target: http://dogtagpki.org/ # all of this goes to one place the graveyard. - - role: httpd/redirectmatch - shortname: keys - website: keys.fedoraproject.org - regex: /(.*)$ - target: https://fedoraproject.org/wiki/Infrastructure/graveyard? - tags: keys - - role: httpd/redirectmatch + - role: httpd/redirect shortname: boot website: boot.fedoraproject.org - regex: /(.*)$ target: https://fedoraproject.org/wiki/Infrastructure/graveyard - role: httpd/redirect diff --git a/playbooks/include/proxies-rewrites.yml b/playbooks/include/proxies-rewrites.yml index 3891c4d507..987153114f 100644 --- a/playbooks/include/proxies-rewrites.yml +++ b/playbooks/include/proxies-rewrites.yml @@ -13,6 +13,12 @@ roles: + - role: httpd/domainrewrite + destname: 00-keys + website: keys.fedoraproject.org + path: ^.*$ + status: 301 + target: https://fedoraproject.org/wiki/Infrastructure/graveyard - role: httpd/domainrewrite destname: admin