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

Just go back to the old bad crappy way of doing this for now.

Browse source
This commit is contained in:
Kevin Fenzi 2016-08-29 21:15:34 +00:00
parent 4c363581f1
commit 6e5d012f51
2 changed files with 87 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

68
playbooks/groups/proxies.yml
View file

@ -73,35 +73,45 @@
# #
# 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
# when: env == 'staging'
# - 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-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 when: env == 'staging'
# file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
# - name: Remove prerelease-to-final-labs-1
# - name: Remove prerelease-to-final-labs-2 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-2-redirectmatch.conf state=absent when: env == 'staging'
#
# - name: Remove prerelease-to-final-arm-1 - name: Remove prerelease-to-final-labs-2
# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent 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-2
# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-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-gfo when: env == 'staging'
# file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
# - name: Remove prerelease-to-final-arm-2
# - name: Remove prerelease-to-final-spins file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent
# 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 - name: Remove prerelease-to-final-gfo
# file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
# when: env == 'staging'
# - name: Remove prerelease-to-final-arm
# file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-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
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
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

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

@ -249,54 +249,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