drop prerelease redirects in stg

This commit is contained in:
Kevin Fenzi 2017-10-01 15:51:23 +00:00
parent b13361f2f2
commit a6715aeb57
2 changed files with 117 additions and 107 deletions

View file

@ -96,55 +96,65 @@
# #
# When we have a prerelease we also need to drop the config files. # When we have a prerelease we also need to drop the config files.
# - name: Remove prerelease-to-final-spins-1 - 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 file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent
# tags: tags:
# - httpd/redirect - 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 - name: Remove prerelease-to-final-spins-2
# tags: file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent
# - httpd/redirect tags:
# - httpd/redirect
# - name: Remove prerelease-to-final-labs-1 when: env == 'staging'
# file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
# tags: - name: Remove prerelease-to-final-labs-1
# - httpd/redirect file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
# tags:
# - name: Remove prerelease-to-final-labs-2 - httpd/redirect
# file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent when: env == 'staging'
# 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
# - name: Remove prerelease-to-final-arm-1 tags:
# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent - httpd/redirect
# tags: when: env == 'staging'
# - httpd/redirect
# - name: Remove prerelease-to-final-arm-1
# - name: Remove prerelease-to-final-arm-2 file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent
# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent tags:
# tags: - httpd/redirect
# - httpd/redirect when: env == 'staging'
#
# - name: Remove prerelease-to-final-gfo - name: Remove prerelease-to-final-arm-2
# file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent
# tags: tags:
# - httpd/redirect - 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 - name: Remove prerelease-to-final-gfo
# tags: file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
# - httpd/redirect tags:
# - httpd/redirect
# - name: Remove prerelease-to-final-labs when: env == 'staging'
# file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
# tags: - name: Remove prerelease-to-final-spins
# - httpd/redirect 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 # - name: Remove prerelease-to-final-arm
# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent # file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
# tags: # tags:
# - httpd/redirect # - httpd/redirect
# when: env == 'staging'
# #
roles: roles:
- httpd/mod_ssl - httpd/mod_ssl

View file

@ -262,68 +262,68 @@
# back to the main release. # back to the main release.
# This should be disabled when there is a prerelease # This should be disabled when there is a prerelease
- role: httpd/redirectmatch # - role: httpd/redirectmatch
name: prerelease-to-final-gfo # name: prerelease-to-final-gfo
website: getfedora.org # website: getfedora.org
regex: /(.*)/prerelease.*$ # regex: /(.*)/prerelease.*$
target: https://stg.getfedora.org/$1 # target: https://stg.getfedora.org/$1
when: env == 'staging' # when: env == 'staging'
#
- role: httpd/redirectmatch # - role: httpd/redirectmatch
name: prerelease-to-final-labs-1 # name: prerelease-to-final-labs-1
website: labs.fedoraproject.org # website: labs.fedoraproject.org
regex: /(.*)/prerelease.*$ # regex: /(.*)/prerelease.*$
target: https://labs.stg.fedoraproject.org/$1 # target: https://labs.stg.fedoraproject.org/$1
when: env == 'staging' # when: env == 'staging'
#
- role: httpd/redirectmatch # - role: httpd/redirectmatch
name: prerelease-to-final-spins-1 # name: prerelease-to-final-spins-1
website: spins.fedoraproject.org # website: spins.fedoraproject.org
regex: /(.*)/prerelease.*$ # regex: /(.*)/prerelease.*$
target: https://spins.stg.fedoraproject.org/$1 # target: https://spins.stg.fedoraproject.org/$1
when: env == 'staging' # when: env == 'staging'
#
- role: httpd/redirectmatch # - role: httpd/redirectmatch
name: prerelease-to-final-arm-1 # name: prerelease-to-final-arm-1
website: arm.fedoraproject.org # website: arm.fedoraproject.org
regex: /(.*)/prerelease.*$ # regex: /(.*)/prerelease.*$
target: https://arm.stg.fedoraproject.org/$1 # target: https://arm.stg.fedoraproject.org/$1
when: env == 'staging' # when: env == 'staging'
#
- role: httpd/redirectmatch # - role: httpd/redirectmatch
name: prerelease-to-final-labs-2 # name: prerelease-to-final-labs-2
website: labs.fedoraproject.org # website: labs.fedoraproject.org
regex: /prerelease.*$ # regex: /prerelease.*$
target: https://labs.stg.fedoraproject.org/$1 # target: https://labs.stg.fedoraproject.org/$1
when: env == 'staging' # when: env == 'staging'
#
- role: httpd/redirectmatch # - role: httpd/redirectmatch
name: prerelease-to-final-spins-2 # name: prerelease-to-final-spins-2
website: spins.fedoraproject.org # website: spins.fedoraproject.org
regex: /prerelease.*$ # regex: /prerelease.*$
target: https://spins.stg.fedoraproject.org/$1 # target: https://spins.stg.fedoraproject.org/$1
when: env == 'staging' # when: env == 'staging'
#
- role: httpd/redirectmatch # - role: httpd/redirectmatch
name: prerelease-to-final-arm-2 # name: prerelease-to-final-arm-2
website: arm.fedoraproject.org # website: arm.fedoraproject.org
regex: /prerelease.*$ # regex: /prerelease.*$
target: https://arm.stg.fedoraproject.org/$1 # target: https://arm.stg.fedoraproject.org/$1
when: env == 'staging' # when: env == 'staging'
#
- role: httpd/redirectmatch # - role: httpd/redirectmatch
name: cloud-to-atomic # name: cloud-to-atomic
website: getfedora.org # website: getfedora.org
regex: /cloud/.*$ # regex: /cloud/.*$
target: https://alt.stg.fedoraproject.org/cloud/$1 # target: https://alt.stg.fedoraproject.org/cloud/$1
when: env == 'staging' # when: env == 'staging'
#
- role: httpd/redirectmatch # - role: httpd/redirectmatch
name: cloud-to-atomic-download # name: cloud-to-atomic-download
website: getfedora.org # website: getfedora.org
regex: /(.*)/cloud/download.*$ # regex: /(.*)/cloud/download.*$
target: https://alt.stg.fedoraproject.org/$1/cloud # target: https://alt.stg.fedoraproject.org/$1/cloud
when: env == 'staging' # when: env == 'staging'
# end staging # end staging