From 041fac03bf15e9fdb2d30f3466456d071d920b86 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 31 Mar 2018 15:35:16 +0000 Subject: [PATCH 1/2] really drop prerelease redirect in stg --- playbooks/groups/proxies.yml | 100 +++++++++++++++++------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 8477bc9dc0..4849efbd5a 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -78,65 +78,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 -# when: env == 'staging' + - 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-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-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-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-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-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-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-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-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' + - 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 From fb3d45d7493d949b176e98bcd569eac74095875e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 31 Mar 2018 16:00:02 +0000 Subject: [PATCH 2/2] missed a few more --- playbooks/groups/proxies.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 4849efbd5a..7be687d3cf 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -120,6 +120,24 @@ - 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: