drop prerelease in production too

This commit is contained in:
Kevin Fenzi 2018-09-25 12:36:22 +00:00
parent ed4de8f2e0
commit cb796d0d1b
2 changed files with 69 additions and 83 deletions

View file

@ -84,85 +84,71 @@
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
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
- name: Remove prerelease-to-final-alt-1 - name: Remove prerelease-to-final-alt-1
file: path=/etc/httpd/conf.d/alt.fedoraproject.org/prerelease-to-final-alt-1-redirectmatch.conf state=absent file: path=/etc/httpd/conf.d/alt.fedoraproject.org/prerelease-to-final-alt-1-redirectmatch.conf state=absent
tags: tags:
- httpd/redirect - httpd/redirect
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
- 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
when: env == "staging"
roles: roles:
- httpd/mod_ssl - httpd/mod_ssl

View file

@ -354,75 +354,75 @@
# 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'
#
- role: httpd/redirectmatch # - role: httpd/redirectmatch
shortname: prerelease-to-final-alt-1 # shortname: prerelease-to-final-alt-1
website: alt.fedoraproject.org # website: alt.fedoraproject.org
regex: /prerelease.*$ # regex: /prerelease.*$
target: https://alt.fedoraproject.org/$1 # target: https://alt.fedoraproject.org/$1
when: env != 'staging' # when: env != 'staging'
# end of prod prerelease # end of prod prerelease