Infrastructure/ansible
5
0
Fork 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

Rework the prerelease redirects to be a little better.

Browse source 
We want them to go away now in staging, at release (tomorrow) we adjust these to remove them in prod too
This commit is contained in:
Kevin Fenzi 2016-08-29 21:04:47 +00:00
parent e315233632
commit 15d52c4780
2 changed files with 93 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

61
playbooks/groups/proxies.yml
View file

@ -72,36 +72,55 @@
pre_tasks:
#
# When we have a prerelease we also need to drop the config files.
- block:
- 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
- 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-labs-1
file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
- 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
file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent
- 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
- name: Remove prerelease-to-final-gfo
file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
- 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-labs
file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
- name: Remove prerelease-to-final-arm
file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
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
#
# - 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
# The above when should be:
#
# - 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 there is a final release and we want redirects
# in both staging and prod
#
# - 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: not env
#
# - 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 there is a prerelease only in 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
# file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
# When there is a prerelease in production and 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
#
# - name: Remove prerelease-to-final-labs
# file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
#
# - name: Remove prerelease-to-final-arm
# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
roles:
- httpd/proxy

145
playbooks/include/proxies-redirects.yml
View file

@ -248,106 +248,67 @@
# When there is no prerelease we redirect the prerelease urls
# back to the main release.
# This should be disabled when there is a prerelease
#
- role: httpd/redirectmatch
name: prerelease-to-final-gfo
website: getfedora.org
regex: /(.*)/prerelease.*$
target: https://stg.getfedora.org/$1
when: env == 'staging'
- block:
- role: httpd/redirectmatch
name: prerelease-to-final-gfo
website: getfedora.org
regex: /(.*)/prerelease.*$
target: https://stg.getfedora.org/$1
- role: httpd/redirectmatch
name: prerelease-to-final-labs-1
website: labs.fedoraproject.org
regex: /(.*)/prerelease.*$
target: https://labs.stg.fedoraproject.org/$1
when: env == 'staging'
- role: httpd/redirectmatch
name: prerelease-to-final-labs-1
website: labs.fedoraproject.org
regex: /(.*)/prerelease.*$
target: https://labs.stg.fedoraproject.org/$1
- role: httpd/redirectmatch
name: prerelease-to-final-spins-1
website: spins.fedoraproject.org
regex: /(.*)/prerelease.*$
target: https://spins.stg.fedoraproject.org/$1
when: env == 'staging'
- role: httpd/redirectmatch
name: prerelease-to-final-spins-1
website: spins.fedoraproject.org
regex: /(.*)/prerelease.*$
target: https://spins.stg.fedoraproject.org/$1
- role: httpd/redirectmatch
name: prerelease-to-final-arm-1
website: arm.fedoraproject.org
regex: /(.*)/prerelease.*$
target: https://arm.stg.fedoraproject.org/$1
when: env == 'staging'
- role: httpd/redirectmatch
name: prerelease-to-final-arm-1
website: arm.fedoraproject.org
regex: /(.*)/prerelease.*$
target: https://arm.stg.fedoraproject.org/$1
- role: httpd/redirectmatch
name: prerelease-to-final-labs-2
website: labs.fedoraproject.org
regex: /prerelease.*$
target: https://labs.stg.fedoraproject.org/$1
when: env == 'staging'
- role: httpd/redirectmatch
name: prerelease-to-final-labs-2
website: labs.fedoraproject.org
regex: /prerelease.*$
target: https://labs.stg.fedoraproject.org/$1
- role: httpd/redirectmatch
name: prerelease-to-final-spins-2
website: spins.fedoraproject.org
regex: /prerelease.*$
target: https://spins.stg.fedoraproject.org/$1
when: env == 'staging'
- role: httpd/redirectmatch
name: prerelease-to-final-spins-2
website: spins.fedoraproject.org
regex: /prerelease.*$
target: https://spins.stg.fedoraproject.org/$1
- role: httpd/redirectmatch
name: prerelease-to-final-arm-2
website: arm.fedoraproject.org
regex: /prerelease.*$
target: https://arm.stg.fedoraproject.org/$1
when: env == 'staging'
- role: httpd/redirectmatch
name: prerelease-to-final-arm-2
website: arm.fedoraproject.org
regex: /prerelease.*$
target: https://arm.stg.fedoraproject.org/$1
when: env == 'production'
# 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'
# The above when should be:
#
# When there is a final release and we want redirects
# in both staging and prod
#
# when: env
#
# When there is a prerelease only in staging
#
# when: env == 'production'
#
# When there is a prerelease in production and staging
#
# when: not env
#
- role: httpd/redirect
name: store