From dda5584a35e2159feee36b04e21ad06da61fcca7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 22 Nov 2016 12:41:39 +0000 Subject: [PATCH] release day commit: readd prerelease redirect, add cloud to atomic redirect, add latest cloud image redirects, setup alt site for websites --- playbooks/groups/secondary.yml | 1 - playbooks/include/proxies-fedora-web.yml | 1 - playbooks/include/proxies-redirects.yml | 123 +++++++++++------- playbooks/include/proxies-websites.yml | 1 - .../templates/httpd/dl.fedoraproject.org.conf | 4 +- roles/rsyncd/files/rsyncd.conf.sundries | 8 ++ 6 files changed, 85 insertions(+), 53 deletions(-) diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index e4a49a8956..e28dcae749 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -44,7 +44,6 @@ name: secondary.fedoraproject.org cert_name: "{{wildcard_cert_name}}" server_aliases: - - alt.fedoraproject.org - archive.fedoraproject.org - archives.fedoraproject.org tasks: diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 51f146d758..540ed1944e 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -49,7 +49,6 @@ website: codecs.fedoraproject.org - role: fedora-web/alt website: alt.fedoraproject.org - when: env == "staging" # Some other static content, not strictly part of "fedora-web" goes below here - role: fedora-docs/proxy diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index 50476051f4..497769fd14 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -314,54 +314,68 @@ # end staging -# - role: httpd/redirectmatch -# name: prerelease-to-final-gfo -# website: getfedora.org -# regex: /(.*)/prerelease.*$ -# target: https://getfedora.org/$1 -# when: env != 'staging' -# -# - role: httpd/redirectmatch -# name: prerelease-to-final-labs-1 -# website: labs.fedoraproject.org -# regex: /(.*)/prerelease.*$ -# target: https://labs.fedoraproject.org/$1 -# when: env != 'staging' -# -# - role: httpd/redirectmatch -# name: prerelease-to-final-spins-1 -# website: spins.fedoraproject.org -# regex: /(.*)/prerelease.*$ -# target: https://spins.fedoraproject.org/$1 -# when: env != 'staging' -# -# - role: httpd/redirectmatch -# name: prerelease-to-final-arm-1 -# website: arm.fedoraproject.org -# regex: /(.*)/prerelease.*$ -# target: https://arm.fedoraproject.org/$1 -# when: env != 'staging' -# -# - role: httpd/redirectmatch -# name: prerelease-to-final-labs-2 -# website: labs.fedoraproject.org -# regex: /prerelease.*$ -# target: https://labs.fedoraproject.org/$1 -# when: env != 'staging' -# -# - role: httpd/redirectmatch -# name: prerelease-to-final-spins-2 -# website: spins.fedoraproject.org -# regex: /prerelease.*$ -# target: https://spins.fedoraproject.org/$1 -# when: env != 'staging' -# -# - role: httpd/redirectmatch -# name: prerelease-to-final-arm-2 -# website: arm.fedoraproject.org -# regex: /prerelease.*$ -# target: https://arm.fedoraproject.org/$1 -# when: env != 'staging' + - role: httpd/redirectmatch + name: prerelease-to-final-gfo + website: getfedora.org + regex: /(.*)/prerelease.*$ + target: https://getfedora.org/$1 + when: env != 'staging' + + - role: httpd/redirectmatch + name: prerelease-to-final-labs-1 + website: labs.fedoraproject.org + regex: /(.*)/prerelease.*$ + target: https://labs.fedoraproject.org/$1 + when: env != 'staging' + + - role: httpd/redirectmatch + name: prerelease-to-final-spins-1 + website: spins.fedoraproject.org + regex: /(.*)/prerelease.*$ + target: https://spins.fedoraproject.org/$1 + when: env != 'staging' + + - role: httpd/redirectmatch + name: prerelease-to-final-arm-1 + website: arm.fedoraproject.org + regex: /(.*)/prerelease.*$ + target: https://arm.fedoraproject.org/$1 + when: env != 'staging' + + - role: httpd/redirectmatch + name: prerelease-to-final-labs-2 + website: labs.fedoraproject.org + regex: /prerelease.*$ + target: https://labs.fedoraproject.org/$1 + when: env != 'staging' + + - role: httpd/redirectmatch + name: prerelease-to-final-spins-2 + website: spins.fedoraproject.org + regex: /prerelease.*$ + target: https://spins.fedoraproject.org/$1 + when: env != 'staging' + + - role: httpd/redirectmatch + name: prerelease-to-final-arm-2 + website: arm.fedoraproject.org + regex: /prerelease.*$ + target: https://arm.fedoraproject.org/$1 + when: env != 'staging' + + - role: httpd/redirectmatch + name: cloud-to-atomic + website: getfedora.org + regex: /cloud/.*$ + target: https://getfedora.org/atomic/$1 + when: env != 'staging' + + - role: httpd/redirectmatch + name: cloud-to-atomic-download + website: getfedora.org + regex: /(.*)/cloud/download.*$ + target: https://getfedora.org/$1/atomic/download + when: env != 'staging' - role: httpd/redirect name: store @@ -472,6 +486,19 @@ ## Cloud image redirects + # Redirects/pointers for fedora 25 BASE cloud images + - role: httpd/redirect + name: cloud-base-64bit-25 + website: cloud.fedoraproject.org + path: /fedora-25.x86_64.qcow2 + target: https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.qcow2 + + - role: httpd/redirect + name: cloud-base-64bit-25-raw + website: cloud.fedoraproject.org + path: /fedora-25.x86_64.raw.xz + target: https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.raw.xz + # Redirects/pointers for fedora 24 BASE cloud images - role: httpd/redirect name: cloud-base-64bit-24 diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 7d47039412..aee7bc26a4 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -542,7 +542,6 @@ - alt.stg.fedoraproject.org sslonly: true cert_name: "{{wildcard_cert_name}}" - when: env == "staging" # Kinda silly that we have two entries here, one for prod and one for stg. # This is inherited from our puppet setup -- we can collapse them as soon as diff --git a/roles/download/templates/httpd/dl.fedoraproject.org.conf b/roles/download/templates/httpd/dl.fedoraproject.org.conf index c14a92158a..8043e46eda 100644 --- a/roles/download/templates/httpd/dl.fedoraproject.org.conf +++ b/roles/download/templates/httpd/dl.fedoraproject.org.conf @@ -1,6 +1,6 @@ ServerName dl.fedoraproject.org - ServerAlias alt.fedoraproject.org archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org + ServerAlias archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org ServerAdmin webmaster@fedoraproject.org TraceEnable Off @@ -10,7 +10,7 @@ ServerName dl.fedoraproject.org - ServerAlias alt.fedoraproject.org archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org + ServerAlias archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org ServerAdmin webmaster@fedoraproject.org diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index 855fc0f3bb..36f9378b47 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -166,6 +166,14 @@ gid = root read only = yes hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 +[alt.fedoraproject.org] +comment = alt.fedoraproject.org +path = /srv/web/alt.fedoraproject.org +uid = root +gid = root +read only = yes +hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 + [fmw] comment = fmw path = /srv/web/fmw