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

re-add redirects for prerelease

Browse source
This commit is contained in:
Kevin Fenzi 2018-05-01 12:20:50 +00:00
parent c77dd04246
commit 4bbe5105e2
2 changed files with 205 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

128
playbooks/groups/proxies.yml
View file

@ -78,70 +78,70 @@
# #
# 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
#
- name: Remove prerelease-to-final-spins-2 # - 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 # file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-labs-1 # - 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 # file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-labs-2 # - 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 # file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-arm-1 # - 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 # file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-arm-2 # - 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 # file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-gfo # - name: Remove prerelease-to-final-gfo
file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent # file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-gfo-atomic-redirectmatch # - name: Remove prerelease-to-final-gfo-atomic-redirectmatch
file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-atomic-redirectmatch.conf state=absent # file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-atomic-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-gfo-srv-redirectmatch # - name: Remove prerelease-to-final-gfo-srv-redirectmatch
file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-srv-redirectmatch.conf state=absent # file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-srv-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-gfo-ws-redirectmatch # - name: Remove prerelease-to-final-gfo-ws-redirectmatch
file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-ws-redirectmatch.conf state=absent # file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-ws-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-spins # - name: Remove prerelease-to-final-spins
file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent # file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- name: Remove prerelease-to-final-labs # - name: Remove prerelease-to-final-labs
file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent # file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
tags: # tags:
- httpd/redirect # - httpd/redirect
#
- 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
roles: roles:
- httpd/mod_ssl - httpd/mod_ssl

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

@ -273,147 +273,149 @@
# 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
# shortname: prerelease-to-final-gfo-ws shortname: prerelease-to-final-gfo-ws
# website: getfedora.org website: getfedora.org
# regex: /(.*)workstation/prerelease.*$ regex: /(.*)workstation/prerelease.*$
# target: https://stg.getfedora.org/$1/workstation target: https://stg.getfedora.org/$1/workstation
# when: env == 'staging' when: env == 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-gfo-srv shortname: prerelease-to-final-gfo-srv
# website: getfedora.org website: getfedora.org
# regex: /(.*)server/prerelease.*$ regex: /(.*)server/prerelease.*$
# target: https://stg.getfedora.org/$1/server target: https://stg.getfedora.org/$1/server
# when: env == 'staging' when: env == 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-gfo-atomic shortname: prerelease-to-final-gfo-atomic
# website: getfedora.org website: getfedora.org
# regex: /(.*)atomic/prerelease.*$ regex: /(.*)atomic/prerelease.*$
# target: https://stg.getfedora.org/$1/atomic target: https://stg.getfedora.org/$1/atomic
# when: env == 'staging' when: env == 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-labs-1 shortname: 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
# shortname: prerelease-to-final-spins-1 shortname: 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
# shortname: prerelease-to-final-arm-1 shortname: 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
# shortname: prerelease-to-final-labs-2 shortname: 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
# shortname: prerelease-to-final-spins-2 shortname: 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
# shortname: prerelease-to-final-arm-2 shortname: 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
# shortname: cloud-to-atomic shortname: 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
# shortname: cloud-to-atomic-download shortname: 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
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-gfo-ws shortname: prerelease-to-final-gfo-ws
# website: getfedora.org website: getfedora.org
# regex: /(.*)workstation/prerelease.*$ regex: /(.*)workstation/prerelease.*$
# target: https://getfedora.org/$1/workstation target: https://getfedora.org/$1/workstation
# when: env != 'staging' when: env != 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-gfo-srv shortname: prerelease-to-final-gfo-srv
# website: getfedora.org website: getfedora.org
# regex: /(.*)server/prerelease.*$ regex: /(.*)server/prerelease.*$
# target: https://getfedora.org/$1/server target: https://getfedora.org/$1/server
# when: env != 'staging' when: env != 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-gfo-atomic shortname: prerelease-to-final-gfo-atomic
# website: getfedora.org website: getfedora.org
# regex: /(.*)atomic/prerelease.*$ regex: /(.*)atomic/prerelease.*$
# target: https://getfedora.org/$1/atomic target: https://getfedora.org/$1/atomic
# when: env != 'staging' when: env != 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-labs-1 shortname: prerelease-to-final-labs-1
# website: labs.fedoraproject.org website: labs.fedoraproject.org
# regex: /(.*)/prerelease.*$ regex: /(.*)/prerelease.*$
# target: https://labs.fedoraproject.org/$1 target: https://labs.fedoraproject.org/$1
# when: env != 'staging' when: env != 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-spins-1 shortname: prerelease-to-final-spins-1
# website: spins.fedoraproject.org website: spins.fedoraproject.org
# regex: /(.*)/prerelease.*$ regex: /(.*)/prerelease.*$
# target: https://spins.fedoraproject.org/$1 target: https://spins.fedoraproject.org/$1
# when: env != 'staging' when: env != 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-arm-1 shortname: prerelease-to-final-arm-1
# website: arm.fedoraproject.org website: arm.fedoraproject.org
# regex: /(.*)/prerelease.*$ regex: /(.*)/prerelease.*$
# target: https://arm.fedoraproject.org/$1 target: https://arm.fedoraproject.org/$1
# when: env != 'staging' when: env != 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-labs-2 shortname: prerelease-to-final-labs-2
# website: labs.fedoraproject.org website: labs.fedoraproject.org
# regex: /prerelease.*$ regex: /prerelease.*$
# target: https://labs.fedoraproject.org/$1 target: https://labs.fedoraproject.org/$1
# when: env != 'staging' when: env != 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-spins-2 shortname: prerelease-to-final-spins-2
# website: spins.fedoraproject.org website: spins.fedoraproject.org
# regex: /prerelease.*$ regex: /prerelease.*$
# target: https://spins.fedoraproject.org/$1 target: https://spins.fedoraproject.org/$1
# when: env != 'staging' when: env != 'staging'
#
# - role: httpd/redirectmatch - role: httpd/redirectmatch
# shortname: prerelease-to-final-arm-2 shortname: prerelease-to-final-arm-2
# website: arm.fedoraproject.org website: arm.fedoraproject.org
# regex: /prerelease.*$ regex: /prerelease.*$
# target: https://arm.fedoraproject.org/$1 target: https://arm.fedoraproject.org/$1
# when: env != 'staging' when: env != 'staging'
# end of prod prerelease
- role: httpd/redirectmatch - role: httpd/redirectmatch
shortname: cloud-to-atomic shortname: cloud-to-atomic