From b0b0acd4e53d6e4bfd2f0d91c531ea1b5cb6a26c Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Thu, 25 May 2023 09:44:49 +1000 Subject: [PATCH] [redirect] fix silverblue redirect Signed-off-by: Ryan Lerch --- playbooks/include/proxies-redirects.yml | 13 +++---------- playbooks/include/proxies-reverseproxy.yml | 10 ---------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index fc19631766..e9e3ba2dc9 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -841,17 +841,10 @@ tags: - fmn - - role: httpd/redirect - shortname: silverblue + - role: httpd/redirectmatch + shortname: 00-silverblue-redirect website: silverblue.fedoraproject.org regex: ^.* target: https://fedoraproject.org/silverblue tags: - - fedoraproject.org - - - role: httpd/redirect - shortname: 00-silverblue-redirect - website: silverblue.fedoraproject.org - target: https://fedoraproject.org/silverblue - tags: - - fdsilverblue + - silverblue diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 369944bff0..88b12d00d1 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -807,16 +807,6 @@ keephost: true tags: mdapi - - role: httpd/reverseproxy - website: silverblue.fedoraproject.org - destname: silverblue - balancer_name: app-os - balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" - targettype: openshift - ocp4: true - keephost: true - tags: silverblue - - role: httpd/reverseproxy website: release-monitoring.org destname: release-monitoring