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

drop prerelease redirects and add cloud redirects for f24 release

Browse source
This commit is contained in:
Kevin Fenzi 2016-06-21 12:36:21 +00:00
parent 8e83d2cc8f
commit 0e1553a816
2 changed files with 133 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

58
playbooks/groups/proxies.yml
View file

@ -73,35 +73,35 @@
# #
# 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
#
- 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
#
- 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
#
- 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
#
- 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
#
- 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
#
- 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
#
- 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
#
- 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
#
- 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
roles: roles:
- httpd/proxy - httpd/proxy

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

@ -249,105 +249,105 @@
# 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
# - 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://getfedora.org/$1 target: https://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.fedoraproject.org/$1 target: https://labs.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.fedoraproject.org/$1 target: https://spins.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.fedoraproject.org/$1 target: https://arm.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.fedoraproject.org/$1 target: https://labs.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.fedoraproject.org/$1 target: https://spins.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.fedoraproject.org/$1 target: https://arm.fedoraproject.org/$1
# when: env != 'staging' when: env != 'staging'
- role: httpd/redirect - role: httpd/redirect
name: store name: store
@ -455,6 +455,19 @@
## Cloud image redirects ## Cloud image redirects
# Redirects/pointers for fedora 24 BASE cloud images
- role: httpd/redirect
name: cloud-base-64bit-24
website: cloud.fedoraproject.org
path: /fedora-24.x86_64.qcow2
target: https://download.fedoraproject.org/pub/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.qcow2
- role: httpd/redirect
name: cloud-base-64bit-24-raw
website: cloud.fedoraproject.org
path: /fedora-24.x86_64.raw.xz
target: https://download.fedoraproject.org/pub/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.raw.xz
# Redirects/pointers for fedora 23 BASE cloud images # Redirects/pointers for fedora 23 BASE cloud images
- role: httpd/redirect - role: httpd/redirect
name: cloud-base-64bit-23 name: cloud-base-64bit-23