drop redirect rules for staging prerelease pages

This commit is contained in:
Robert Mayr 2016-03-15 15:55:32 +00:00
parent 28ac2669ae
commit ab98182a50
2 changed files with 77 additions and 50 deletions

View file

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

View file

@ -219,54 +219,54 @@
# 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'
# end staging # end staging