diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 2eec4c6187..53be4b53dd 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -29,8 +29,6 @@ website: flocktofedora.org - role: fedora-web/labs website: labs.fedoraproject.org - - role: fedora-web/arm - website: arm.fedoraproject.org - role: fedora-web/iot website: iot.fedoraproject.org - role: fedora-web/registry diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index c1ebc0683c..58a7d76f71 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -251,6 +251,14 @@ tags: - fedoraproject.org + # ARM redirect + - role: httpd/redirect + shortname: arm-fedoraproject + website: arm.fedoraproject.org + target: https://fedoraproject.org/ + tags: + - fedoraproject.org + - role: httpd/redirect shortname: flocktofedora website: flocktofedora.net @@ -322,14 +330,6 @@ redirectmatch_enabled: false when: env == 'staging' - - role: httpd/redirectmatch - shortname: prerelease-to-final-arm-1 - website: arm.fedoraproject.org - regex: /(.*)prerelease.*$ - target: https://arm.stg.fedoraproject.org/$1 - redirectmatch_enabled: false - when: env == 'staging' - - role: httpd/redirectmatch shortname: prerelease-to-final-labs-2 website: labs.fedoraproject.org @@ -346,14 +346,6 @@ redirectmatch_enabled: false when: env == 'staging' - - role: httpd/redirectmatch - shortname: prerelease-to-final-arm-2 - website: arm.fedoraproject.org - regex: /prerelease.*$ - target: https://arm.stg.fedoraproject.org/$1 - redirectmatch_enabled: false - when: env == 'staging' - - role: httpd/redirectmatch shortname: prerelease-to-final-alt-1 website: alt.fedoraproject.org @@ -380,14 +372,6 @@ redirectmatch_enabled: false when: env != 'staging' - - role: httpd/redirectmatch - shortname: prerelease-to-final-arm-1 - website: arm.fedoraproject.org - regex: /(.*)/prerelease.*$ - target: https://arm.fedoraproject.org/$1 - redirectmatch_enabled: false - when: env != 'staging' - - role: httpd/redirectmatch shortname: prerelease-to-final-labs-2 website: labs.fedoraproject.org @@ -404,14 +388,6 @@ redirectmatch_enabled: false when: env != 'staging' - - role: httpd/redirectmatch - shortname: prerelease-to-final-arm-2 - website: arm.fedoraproject.org - regex: /prerelease.*$ - target: https://arm.fedoraproject.org/$1 - redirectmatch_enabled: false - when: env != 'staging' - - role: httpd/redirectmatch shortname: prerelease-to-final-alt-1 website: alt.fedoraproject.org