From ce31f4de5e2ba2329872285c11ff6ef8662a0451 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 13 Mar 2017 20:50:03 +0000 Subject: [PATCH] drop the prerelease redirect in staging only --- playbooks/groups/proxies.yml | 108 +++++++++++++----------- playbooks/include/proxies-redirects.yml | 96 ++++++++++----------- 2 files changed, 107 insertions(+), 97 deletions(-) diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 4ebe1e76f3..08b80fcb93 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -75,55 +75,65 @@ # # 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-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-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-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-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 6b4240a544..b03bb5e200 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -249,54 +249,54 @@ # back to the main release. # This should be disabled when there is a prerelease - - role: httpd/redirectmatch - name: prerelease-to-final-gfo - website: getfedora.org - regex: /(.*)/prerelease.*$ - target: https://stg.getfedora.org/$1 - when: env == 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-labs-1 - website: labs.fedoraproject.org - regex: /(.*)/prerelease.*$ - target: https://labs.stg.fedoraproject.org/$1 - when: env == 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-spins-1 - website: spins.fedoraproject.org - regex: /(.*)/prerelease.*$ - target: https://spins.stg.fedoraproject.org/$1 - when: env == 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-arm-1 - website: arm.fedoraproject.org - regex: /(.*)/prerelease.*$ - target: https://arm.stg.fedoraproject.org/$1 - when: env == 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-labs-2 - website: labs.fedoraproject.org - regex: /prerelease.*$ - target: https://labs.stg.fedoraproject.org/$1 - when: env == 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-spins-2 - website: spins.fedoraproject.org - regex: /prerelease.*$ - target: https://spins.stg.fedoraproject.org/$1 - when: env == 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-arm-2 - website: arm.fedoraproject.org - regex: /prerelease.*$ - target: https://arm.stg.fedoraproject.org/$1 - when: env == 'staging' +# - role: httpd/redirectmatch +# name: prerelease-to-final-gfo +# website: getfedora.org +# regex: /(.*)/prerelease.*$ +# target: https://stg.getfedora.org/$1 +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-labs-1 +# website: labs.fedoraproject.org +# regex: /(.*)/prerelease.*$ +# target: https://labs.stg.fedoraproject.org/$1 +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-spins-1 +# website: spins.fedoraproject.org +# regex: /(.*)/prerelease.*$ +# target: https://spins.stg.fedoraproject.org/$1 +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-arm-1 +# website: arm.fedoraproject.org +# regex: /(.*)/prerelease.*$ +# target: https://arm.stg.fedoraproject.org/$1 +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-labs-2 +# website: labs.fedoraproject.org +# regex: /prerelease.*$ +# target: https://labs.stg.fedoraproject.org/$1 +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-spins-2 +# website: spins.fedoraproject.org +# regex: /prerelease.*$ +# target: https://spins.stg.fedoraproject.org/$1 +# when: env == 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-arm-2 +# website: arm.fedoraproject.org +# regex: /prerelease.*$ +# target: https://arm.stg.fedoraproject.org/$1 +# when: env == 'staging' - role: httpd/redirectmatch name: cloud-to-atomic