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

Proxies etc: Redirect to https where possible

Browse source
This commit is contained in:
Till Maas 2015-07-22 18:53:49 +02:00
parent 8572e05546
commit 0aba861fb1
3 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,13 +23,13 @@
name: community name: community
website: admin.fedoraproject.org website: admin.fedoraproject.org
path: /community path: /community
target: http://apps.fedoraproject.org/packages target: https://apps.fedoraproject.org/packages
- role: httpd/redirect - role: httpd/redirect
name: docs name: docs
website: fedoraproject.org website: fedoraproject.org
path: /docs path: /docs
target: http://docs.fedoraproject.org/ target: https://docs.fedoraproject.org/
- role: httpd/redirect - role: httpd/redirect
name: elections name: elections
@ -55,7 +55,7 @@
- role: httpd/redirect - role: httpd/redirect
name: get-fedora name: get-fedora
website: get.fedoraproject.org website: get.fedoraproject.org
target: http://fedoraproject.org/get-fedora target: https://getfedora.org/
status: 302 status: 302
- role: httpd/redirect - role: httpd/redirect
@ -73,13 +73,13 @@
- role: httpd/redirect - role: httpd/redirect
name: join-fedora name: join-fedora
website: join.fedoraproject.org website: join.fedoraproject.org
target: http://fedoraproject.org/wiki/Join target: https://fedoraproject.org/wiki/Join
status: 302 status: 302
- role: httpd/redirect - role: httpd/redirect
name: get-help name: get-help
website: help.fedoraproject.org website: help.fedoraproject.org
target: http://fedoraproject.org/get-help target: https://fedoraproject.org/get-help
status: 302 status: 302
- role: httpd/redirect - role: httpd/redirect
@ -173,7 +173,7 @@
- role: httpd/redirect - role: httpd/redirect
name: site name: site
website: fedoraproject.com website: fedoraproject.com
target: http://fedoraproject.org/ target: https://getfedora.org/
# Planet/people convenience # Planet/people convenience
@ -221,7 +221,7 @@
- role: httpd/redirect - role: httpd/redirect
name: kde name: kde
website: kde.fedoraproject.org website: kde.fedoraproject.org
target: http://spins.fedoraproject.org/kde/ target: https://spins.fedoraproject.org/kde/
status: 302 status: 302
@ -241,7 +241,7 @@
- role: httpd/redirect - role: httpd/redirect
name: cloud-front-page name: cloud-front-page
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
target: http://fedoraproject.org/en/get-fedora#clouds target: https://getfedora.org/cloud/
- role: httpd/redirectmatch - role: httpd/redirectmatch
name: redirect-cloudstart name: redirect-cloudstart
@ -256,143 +256,143 @@
name: cloud-base-64bit-22 name: cloud-base-64bit-22
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-22.x86_64.qcow2 path: /fedora-22.x86_64.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2
- role: httpd/redirect - role: httpd/redirect
name: cloud-base-64bit-22-raw name: cloud-base-64bit-22-raw
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-22.x86_64.raw.xz path: /fedora-22.x86_64.raw.xz
target: http://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.raw.xz target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.raw.xz
- role: httpd/redirect - role: httpd/redirect
name: cloud-base-32bit-22-raw name: cloud-base-32bit-22-raw
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-22.i386.raw.xz path: /fedora-22.i386.raw.xz
target: http://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/i386/Images/Fedora-Cloud-Base-22-20150521.i386.raw.xz target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/i386/Images/Fedora-Cloud-Base-22-20150521.i386.raw.xz
- role: httpd/redirect - role: httpd/redirect
name: cloud-base-32bit-22 name: cloud-base-32bit-22
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-22.i386.qcow2 path: /fedora-22.i386.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/i386/Images/Fedora-Cloud-Base-22-20150521.i386.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/i386/Images/Fedora-Cloud-Base-22-20150521.i386.qcow2
# Redirects/pointers for fedora 22 ATOMIC cloud images # Redirects/pointers for fedora 22 ATOMIC cloud images
- role: httpd/redirect - role: httpd/redirect
name: cloud-atomic-64bit-22 name: cloud-atomic-64bit-22
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-atomic-22.x86_64.qcow2 path: /fedora-atomic-22.x86_64.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.qcow2
- role: httpd/redirect - role: httpd/redirect
name: cloud-atomic-64bit-22-raw name: cloud-atomic-64bit-22-raw
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-atomic-22.x86_64.raw.xz path: /fedora-atomic-22.x86_64.raw.xz
target: http://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.raw.xz target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.raw.xz
# Redirects/pointers for fedora 21 BASE cloud images # Redirects/pointers for fedora 21 BASE cloud images
- role: httpd/redirect - role: httpd/redirect
name: cloud-base-64bit-21 name: cloud-base-64bit-21
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-21.x86_64.qcow2 path: /fedora-21.x86_64.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2
- role: httpd/redirect - role: httpd/redirect
name: cloud-base-64bit-21-raw name: cloud-base-64bit-21-raw
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-21.x86_64.raw.xz path: /fedora-21.x86_64.raw.xz
target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz
- role: httpd/redirect - role: httpd/redirect
name: cloud-base-32bit-21-raw name: cloud-base-32bit-21-raw
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-21.i386.raw.xz path: /fedora-21.i386.raw.xz
target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Base-20141203-21.i386.raw.xz target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Base-20141203-21.i386.raw.xz
- role: httpd/redirect - role: httpd/redirect
name: cloud-base-32bit-21 name: cloud-base-32bit-21
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-21.i386.qcow2 path: /fedora-21.i386.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Base-20141203-21.i386.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Base-20141203-21.i386.qcow2
# Redirects/pointers for fedora 21 ATOMIC cloud images # Redirects/pointers for fedora 21 ATOMIC cloud images
- role: httpd/redirect - role: httpd/redirect
name: cloud-atomic-64bit-21 name: cloud-atomic-64bit-21
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-atomic-21.x86_64.qcow2 path: /fedora-atomic-21.x86_64.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Atomic-20141203-21.x86_64.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Atomic-20141203-21.x86_64.qcow2
- role: httpd/redirect - role: httpd/redirect
name: cloud-atomic-64bit-21-raw name: cloud-atomic-64bit-21-raw
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-atomic-21.x86_64.raw.xz path: /fedora-atomic-21.x86_64.raw.xz
target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Atomic-20141203-21.x86_64.raw.xz target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Atomic-20141203-21.x86_64.raw.xz
# Except, there are no 32bit atomic images atm. # Except, there are no 32bit atomic images atm.
#- role: httpd/redirect #- role: httpd/redirect
# name: cloud-atomic-32bit-21-raw # name: cloud-atomic-32bit-21-raw
# website: cloud.fedoraproject.org # website: cloud.fedoraproject.org
# path: /fedora-atomic-21.i386.raw.xz # path: /fedora-atomic-21.i386.raw.xz
# target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Atomic-20141203-21.i386.raw.xz # target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Atomic-20141203-21.i386.raw.xz
#- role: httpd/redirect #- role: httpd/redirect
# name: cloud-atomic-32bit-21 # name: cloud-atomic-32bit-21
# website: cloud.fedoraproject.org # website: cloud.fedoraproject.org
# path: /fedora-atomic-21.i386.qcow2 # path: /fedora-atomic-21.i386.qcow2
# target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Atomic-20141203-21.i386.qcow2 # target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Atomic-20141203-21.i386.qcow2
# Redirects/pointers for fedora 20 cloud images # Redirects/pointers for fedora 20 cloud images
- role: httpd/redirect - role: httpd/redirect
name: cloud-64bit-20 name: cloud-64bit-20
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-20.x86_64.qcow2 path: /fedora-20.x86_64.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/x86_64/Fedora-x86_64-20-20140407-sda.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/x86_64/Fedora-x86_64-20-20140407-sda.qcow2
- role: httpd/redirect - role: httpd/redirect
name: cloud-32bit-20 name: cloud-32bit-20
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-20.i386.qcow2 path: /fedora-20.i386.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/i386/Fedora-i386-20-20140407-sda.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/i386/Fedora-i386-20-20140407-sda.qcow2
- role: httpd/redirect - role: httpd/redirect
name: cloud-64bit-20-raw name: cloud-64bit-20-raw
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-20.x86_64.raw.xz path: /fedora-20.x86_64.raw.xz
target: http://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/x86_64/Fedora-x86_64-20-20140407-sda.raw.xz target: https://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/x86_64/Fedora-x86_64-20-20140407-sda.raw.xz
- role: httpd/redirect - role: httpd/redirect
name: cloud-32bit-20-raw name: cloud-32bit-20-raw
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-20.i386.raw.xz path: /fedora-20.i386.raw.xz
target: http://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/i386/Fedora-i386-20-20140407-sda.raw.xz target: https://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/i386/Fedora-i386-20-20140407-sda.raw.xz
# Redirects/pointers for fedora 19 cloud images # Redirects/pointers for fedora 19 cloud images
- role: httpd/redirect - role: httpd/redirect
name: cloud-64bit-19 name: cloud-64bit-19
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-19.x86_64.qcow2 path: /fedora-19.x86_64.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/updates/19/Images/x86_64/Fedora-x86_64-19-20140407-sda.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/updates/19/Images/x86_64/Fedora-x86_64-19-20140407-sda.qcow2
- role: httpd/redirect - role: httpd/redirect
name: cloud-32bit-19 name: cloud-32bit-19
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-19.i386.qcow2 path: /fedora-19.i386.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/updates/19/Images/i386/Fedora-i386-19-20140407-sda.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/updates/19/Images/i386/Fedora-i386-19-20140407-sda.qcow2
# Redirects/pointers for latest fedora cloud images. # Redirects/pointers for latest fedora cloud images.
- role: httpd/redirect - role: httpd/redirect
name: cloud-64bit-latest name: cloud-64bit-latest
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-latest.x86_64.qcow2 path: /fedora-latest.x86_64.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2
- role: httpd/redirect - role: httpd/redirect
name: cloud-32bit-latest name: cloud-32bit-latest
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-latest.i386.qcow2 path: /fedora-latest.i386.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/i386/Images/Fedora-Cloud-Base-22-20150521.i386.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/i386/Images/Fedora-Cloud-Base-22-20150521.i386.qcow2
- role: httpd/redirect - role: httpd/redirect
name: cloud-atomic-64bit-latest name: cloud-atomic-64bit-latest
website: cloud.fedoraproject.org website: cloud.fedoraproject.org
path: /fedora-atomic-latest.x86_64.qcow2 path: /fedora-atomic-latest.x86_64.qcow2
target: http://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.qcow2 target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.qcow2

2
playbooks/include/proxies-websites.yml
View file

@ -54,7 +54,7 @@
- localhost - localhost
# This is for all the other domains we own # This is for all the other domains we own
# that redirect to http://fedoraproject.org # that redirect to https://fedoraproject.org
- role: httpd/website - role: httpd/website
name: fedoraproject.com name: fedoraproject.com
cert_name: "{{wildcard_cert_name}}" cert_name: "{{wildcard_cert_name}}"

2
roles/fedmsg/crl/tasks/main.yml
View file

@ -1,7 +1,7 @@
# fedmsg has a relatively static CRL (certificate revocation list) that # fedmsg has a relatively static CRL (certificate revocation list) that
# needs to be publicly accessible. We pull it here from the private # needs to be publicly accessible. We pull it here from the private
# repo and throw it into fedoraproject.org/fedmsg/crl.pem # repo and throw it into fedoraproject.org/fedmsg/crl.pem
# See http://infrastructure.fedoraproject.org/infra/docs/fedmsg-certs.txt # See https://infrastructure.fedoraproject.org/infra/docs/fedmsg-certs.txt
- name: Ensure dir for content exists - name: Ensure dir for content exists
file: dest=/srv/web/fedmsg owner=apache group=apache mode=0755 state=directory file: dest=/srv/web/fedmsg owner=apache group=apache mode=0755 state=directory