diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2017-04-04 11:31:37 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2017-04-04 11:31:37 +0000 |
| commit | ce9713f5f890bcf9242b8bc0e5f9f1a3a91f469f (patch) | |
| tree | a9df6c5dac71061d8b7ef9bc3d8bdf4439a4ae06 | |
| parent | 6bd6bf09395763754bceccce8439e249d0ffe29f (diff) | |
| download | ansible-ce9713f5f890bcf9242b8bc0e5f9f1a3a91f469f.tar.gz ansible-ce9713f5f890bcf9242b8bc0e5f9f1a3a91f469f.tar.xz ansible-ce9713f5f890bcf9242b8bc0e5f9f1a3a91f469f.zip | |
drop prerelease redirect to prep for alpha release
| -rw-r--r-- | playbooks/groups/proxies.yml | 10 | ||||
| -rw-r--r-- | playbooks/include/proxies-redirects.yml | 96 |
2 files changed, 48 insertions, 58 deletions
diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 08b80fcb9..f5fb7ee24 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -79,61 +79,51 @@ 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 b03bb5e20..e596fd956 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -314,54 +314,54 @@ # end staging - - role: httpd/redirectmatch - name: prerelease-to-final-gfo - website: getfedora.org - regex: /(.*)/prerelease.*$ - target: https://getfedora.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-labs-1 - website: labs.fedoraproject.org - regex: /(.*)/prerelease.*$ - target: https://labs.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-spins-1 - website: spins.fedoraproject.org - regex: /(.*)/prerelease.*$ - target: https://spins.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-arm-1 - website: arm.fedoraproject.org - regex: /(.*)/prerelease.*$ - target: https://arm.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-labs-2 - website: labs.fedoraproject.org - regex: /prerelease.*$ - target: https://labs.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-spins-2 - website: spins.fedoraproject.org - regex: /prerelease.*$ - target: https://spins.fedoraproject.org/$1 - when: env != 'staging' - - - role: httpd/redirectmatch - name: prerelease-to-final-arm-2 - website: arm.fedoraproject.org - regex: /prerelease.*$ - target: https://arm.fedoraproject.org/$1 - when: env != 'staging' +# - role: httpd/redirectmatch +# name: prerelease-to-final-gfo +# website: getfedora.org +# regex: /(.*)/prerelease.*$ +# target: https://getfedora.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-labs-1 +# website: labs.fedoraproject.org +# regex: /(.*)/prerelease.*$ +# target: https://labs.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-spins-1 +# website: spins.fedoraproject.org +# regex: /(.*)/prerelease.*$ +# target: https://spins.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-arm-1 +# website: arm.fedoraproject.org +# regex: /(.*)/prerelease.*$ +# target: https://arm.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-labs-2 +# website: labs.fedoraproject.org +# regex: /prerelease.*$ +# target: https://labs.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-spins-2 +# website: spins.fedoraproject.org +# regex: /prerelease.*$ +# target: https://spins.fedoraproject.org/$1 +# when: env != 'staging' +# +# - role: httpd/redirectmatch +# name: prerelease-to-final-arm-2 +# website: arm.fedoraproject.org +# regex: /prerelease.*$ +# target: https://arm.fedoraproject.org/$1 +# when: env != 'staging' - role: httpd/redirectmatch name: cloud-to-atomic |