diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 0dad360f1c..b1721c6d16 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -80,75 +80,89 @@ # # When we have a prerelease we also need to drop the config files. -# - name: Remove prerelease-to-final-spins-1 -# file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-spins-2 -# file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-labs-1 -# file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-labs-2 -# file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-arm-1 -# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-arm-2 -# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-alt-1 -# file: path=/etc/httpd/conf.d/alt.fedoraproject.org/prerelease-to-final-alt-1-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-gfo -# file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-gfo-atomic-redirectmatch -# file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-atomic-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-gfo-srv-redirectmatch -# file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-srv-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-gfo-ws-redirectmatch -# file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-ws-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-spins -# file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-labs -# file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent -# tags: -# - httpd/redirect -# -# - name: Remove prerelease-to-final-arm -# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent -# tags: -# - httpd/redirect + - name: Remove prerelease-to-final-spins-1 + file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-spins-2 + file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-labs-1 + file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-labs-2 + file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-arm-1 + file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-arm-2 + file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-alt-1 + file: path=/etc/httpd/conf.d/alt.fedoraproject.org/prerelease-to-final-alt-1-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-gfo + file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-gfo-atomic-redirectmatch + file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-atomic-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-gfo-srv-redirectmatch + file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-srv-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-gfo-ws-redirectmatch + file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-ws-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-spins + file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-labs + file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" + + - name: Remove prerelease-to-final-arm + file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent + tags: + - httpd/redirect + when: env == "staging" roles: - httpd/mod_ssl diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index 3a108eda34..8f1fd79c0d 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -275,69 +275,69 @@ # back to the main release. # This should be disabled when there is a prerelease - - role: httpd/redirectmatch - shortname: prerelease-to-final-gfo-ws - website: getfedora.org - regex: /(.*)workstation/prerelease.*$ - target: https://stg.getfedora.org/$1/workstation - when: env == 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-gfo-srv - website: getfedora.org - regex: /(.*)server/prerelease.*$ - target: https://stg.getfedora.org/$1/server - when: env == 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-gfo-atomic - website: getfedora.org - regex: /(.*)atomic/prerelease.*$ - target: https://stg.getfedora.org/$1/atomic - when: env == 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-labs-1 - website: labs.fedoraproject.org - regex: /(.*)prerelease.*$ - target: https://labs.stg.fedoraproject.org/$1 - when: env == 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-spins-1 - website: spins.fedoraproject.org - regex: /(.*)prerelease.*$ - target: https://spins.stg.fedoraproject.org/$1 - 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 - when: env == 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-labs-2 - website: labs.fedoraproject.org - regex: /prerelease.*$ - target: https://labs.stg.fedoraproject.org/$1 - when: env == 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-spins-2 - website: spins.fedoraproject.org - regex: /prerelease.*$ - target: https://spins.stg.fedoraproject.org/$1 - 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 - when: env == 'staging' - +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-gfo-ws +# website: getfedora.org +# regex: /(.*)workstation/prerelease.*$ +# target: https://stg.getfedora.org/$1/workstation +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-gfo-srv +# website: getfedora.org +# regex: /(.*)server/prerelease.*$ +# target: https://stg.getfedora.org/$1/server +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-gfo-atomic +# website: getfedora.org +# regex: /(.*)atomic/prerelease.*$ +# target: https://stg.getfedora.org/$1/atomic +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-labs-1 +# website: labs.fedoraproject.org +# regex: /(.*)prerelease.*$ +# target: https://labs.stg.fedoraproject.org/$1 +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-spins-1 +# website: spins.fedoraproject.org +# regex: /(.*)prerelease.*$ +# target: https://spins.stg.fedoraproject.org/$1 +# 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 +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-labs-2 +# website: labs.fedoraproject.org +# regex: /prerelease.*$ +# target: https://labs.stg.fedoraproject.org/$1 +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-spins-2 +# website: spins.fedoraproject.org +# regex: /prerelease.*$ +# target: https://spins.stg.fedoraproject.org/$1 +# 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 +# when: env == 'staging' +# - role: httpd/redirectmatch shortname: cloud-to-atomic website: getfedora.org