From cb796d0d1be668154cc3d9d668cc85c59126b196 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 25 Sep 2018 12:36:22 +0000 Subject: [PATCH] drop prerelease in production too --- playbooks/groups/proxies.yml | 14 --- playbooks/include/proxies-redirects.yml | 138 ++++++++++++------------ 2 files changed, 69 insertions(+), 83 deletions(-) diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index b1721c6d16..fbf05c48e2 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -84,85 +84,71 @@ 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 8f1fd79c0d..0c496f29b2 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -354,75 +354,75 @@ # end staging - - role: httpd/redirectmatch - shortname: prerelease-to-final-gfo-ws - website: getfedora.org - regex: /(.*)workstation/prerelease.*$ - target: https://getfedora.org/$1/workstation - when: env != 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-gfo-srv - website: getfedora.org - regex: /(.*)server/prerelease.*$ - target: https://getfedora.org/$1/server - when: env != 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-gfo-atomic - website: getfedora.org - regex: /(.*)atomic/prerelease.*$ - target: https://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.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-spins-1 - website: spins.fedoraproject.org - regex: /(.*)/prerelease.*$ - target: https://spins.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-arm-1 - website: arm.fedoraproject.org - regex: /(.*)/prerelease.*$ - target: https://arm.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-labs-2 - website: labs.fedoraproject.org - regex: /prerelease.*$ - target: https://labs.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-spins-2 - website: spins.fedoraproject.org - regex: /prerelease.*$ - target: https://spins.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-arm-2 - website: arm.fedoraproject.org - regex: /prerelease.*$ - target: https://arm.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - shortname: prerelease-to-final-alt-1 - website: alt.fedoraproject.org - regex: /prerelease.*$ - target: https://alt.fedoraproject.org/$1 - when: env != 'staging' +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-gfo-ws +# website: getfedora.org +# regex: /(.*)workstation/prerelease.*$ +# target: https://getfedora.org/$1/workstation +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-gfo-srv +# website: getfedora.org +# regex: /(.*)server/prerelease.*$ +# target: https://getfedora.org/$1/server +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-gfo-atomic +# website: getfedora.org +# regex: /(.*)atomic/prerelease.*$ +# target: https://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.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-spins-1 +# website: spins.fedoraproject.org +# regex: /(.*)/prerelease.*$ +# target: https://spins.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-arm-1 +# website: arm.fedoraproject.org +# regex: /(.*)/prerelease.*$ +# target: https://arm.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-labs-2 +# website: labs.fedoraproject.org +# regex: /prerelease.*$ +# target: https://labs.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-spins-2 +# website: spins.fedoraproject.org +# regex: /prerelease.*$ +# target: https://spins.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-arm-2 +# website: arm.fedoraproject.org +# regex: /prerelease.*$ +# target: https://arm.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# shortname: prerelease-to-final-alt-1 +# website: alt.fedoraproject.org +# regex: /prerelease.*$ +# target: https://alt.fedoraproject.org/$1 +# when: env != 'staging' # end of prod prerelease