Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Revert "Rework the prerelease redirects to be a little better."

Browse source 
This reverts commit 15d52c4780.

Everything is horrible. You cannot use block: in roles so this is all doomed.
This commit is contained in:
Kevin Fenzi 2016-08-29 21:13:09 +00:00
parent 15d52c4780
commit 4e9011a822
2 changed files with 113 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

61
playbooks/groups/proxies.yml
View file

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

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

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