From 0aba861fb1c83664bf24e9ae330e8901fc5cc2b6 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 22 Jul 2015 18:53:49 +0200 Subject: [PATCH] Proxies etc: Redirect to https where possible --- playbooks/include/proxies-redirects.yml | 62 ++++++++++++------------- playbooks/include/proxies-websites.yml | 2 +- roles/fedmsg/crl/tasks/main.yml | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index e5c6785467..2b41e45267 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -23,13 +23,13 @@ name: community website: admin.fedoraproject.org path: /community - target: http://apps.fedoraproject.org/packages + target: https://apps.fedoraproject.org/packages - role: httpd/redirect name: docs website: fedoraproject.org path: /docs - target: http://docs.fedoraproject.org/ + target: https://docs.fedoraproject.org/ - role: httpd/redirect name: elections @@ -55,7 +55,7 @@ - role: httpd/redirect name: get-fedora website: get.fedoraproject.org - target: http://fedoraproject.org/get-fedora + target: https://getfedora.org/ status: 302 - role: httpd/redirect @@ -73,13 +73,13 @@ - role: httpd/redirect name: join-fedora website: join.fedoraproject.org - target: http://fedoraproject.org/wiki/Join + target: https://fedoraproject.org/wiki/Join status: 302 - role: httpd/redirect name: get-help website: help.fedoraproject.org - target: http://fedoraproject.org/get-help + target: https://fedoraproject.org/get-help status: 302 - role: httpd/redirect @@ -173,7 +173,7 @@ - role: httpd/redirect name: site website: fedoraproject.com - target: http://fedoraproject.org/ + target: https://getfedora.org/ # Planet/people convenience @@ -221,7 +221,7 @@ - role: httpd/redirect name: kde website: kde.fedoraproject.org - target: http://spins.fedoraproject.org/kde/ + target: https://spins.fedoraproject.org/kde/ status: 302 @@ -241,7 +241,7 @@ - role: httpd/redirect name: cloud-front-page website: cloud.fedoraproject.org - target: http://fedoraproject.org/en/get-fedora#clouds + target: https://getfedora.org/cloud/ - role: httpd/redirectmatch name: redirect-cloudstart @@ -256,143 +256,143 @@ name: cloud-base-64bit-22 website: cloud.fedoraproject.org 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 name: cloud-base-64bit-22-raw website: cloud.fedoraproject.org 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 name: cloud-base-32bit-22-raw website: cloud.fedoraproject.org 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 name: cloud-base-32bit-22 website: cloud.fedoraproject.org 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 - role: httpd/redirect name: cloud-atomic-64bit-22 website: cloud.fedoraproject.org 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 name: cloud-atomic-64bit-22-raw website: cloud.fedoraproject.org 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 - role: httpd/redirect name: cloud-base-64bit-21 website: cloud.fedoraproject.org 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 name: cloud-base-64bit-21-raw website: cloud.fedoraproject.org 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 name: cloud-base-32bit-21-raw website: cloud.fedoraproject.org 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 name: cloud-base-32bit-21 website: cloud.fedoraproject.org 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 - role: httpd/redirect name: cloud-atomic-64bit-21 website: cloud.fedoraproject.org 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 name: cloud-atomic-64bit-21-raw website: cloud.fedoraproject.org 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. #- role: httpd/redirect # name: cloud-atomic-32bit-21-raw # website: cloud.fedoraproject.org # 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 # name: cloud-atomic-32bit-21 # website: cloud.fedoraproject.org # 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 - role: httpd/redirect name: cloud-64bit-20 website: cloud.fedoraproject.org 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 name: cloud-32bit-20 website: cloud.fedoraproject.org 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 name: cloud-64bit-20-raw website: cloud.fedoraproject.org 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 name: cloud-32bit-20-raw website: cloud.fedoraproject.org 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 - role: httpd/redirect name: cloud-64bit-19 website: cloud.fedoraproject.org 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 name: cloud-32bit-19 website: cloud.fedoraproject.org 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. - role: httpd/redirect name: cloud-64bit-latest website: cloud.fedoraproject.org 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 name: cloud-32bit-latest website: cloud.fedoraproject.org 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 name: cloud-atomic-64bit-latest website: cloud.fedoraproject.org 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 diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index d83a32d1fd..a71cd66ffc 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -54,7 +54,7 @@ - localhost # This is for all the other domains we own - # that redirect to http://fedoraproject.org + # that redirect to https://fedoraproject.org - role: httpd/website name: fedoraproject.com cert_name: "{{wildcard_cert_name}}" diff --git a/roles/fedmsg/crl/tasks/main.yml b/roles/fedmsg/crl/tasks/main.yml index e412e1d71a..7d275ee9a6 100644 --- a/roles/fedmsg/crl/tasks/main.yml +++ b/roles/fedmsg/crl/tasks/main.yml @@ -1,7 +1,7 @@ # fedmsg has a relatively static CRL (certificate revocation list) that # needs to be publicly accessible. We pull it here from the private # 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 file: dest=/srv/web/fedmsg owner=apache group=apache mode=0755 state=directory