From e5929f6f9b797f6a51c635a775c1e4440fa44186 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 2 Sep 2021 16:01:50 -0700 Subject: [PATCH] proxies: add mirrors.stg.centos.org for mirrorlist testing in staging The cert here is gotten from centos.org folks and checked into private. At some point we will get a longer term cert here so there's less manual churn. Otherwise we just make a new mirrors.stg.centos.org and proxy it to mirrorlists just like mirrors.stg.fedoraproject.org. Signed-off-by: Kevin Fenzi --- inventory/group_vars/staging | 5 +++++ playbooks/include/proxies-reverseproxy.yml | 6 ++++++ playbooks/include/proxies-websites.yml | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/inventory/group_vars/staging b/inventory/group_vars/staging index cb43981328..d835165a1a 100644 --- a/inventory/group_vars/staging +++ b/inventory/group_vars/staging @@ -24,6 +24,11 @@ ocp_wildcard_cert_file: wildcard-2021.apps.ocp.stg.fedoraproject.org.cert ocp_wildcard_key_file: wildcard-2021.apps.ocp.stg.fedoraproject.org.key ocp_wildcard_int_file: wildcard-2021.apps.ocp.stg.fedoraproject.org.intermediate.cert +# This is the mirrors.stg.centos.org certs +mirrors_centos_org_cert_name: mirrors.stg.centos.org +mirrors_centos_org_cert_file: mirrors.stg.centos.org.cert +mirrors_centos_org_key_file: mirrors.stg.centos.org.key + fedmsg_prefix: org.fedoraproject fedmsg_env: stg deployment_type: stg diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 179233231d..6fb134e07f 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -362,6 +362,12 @@ destname: mirrormanager-mirrorlist proxyurl: http://localhost:10002 + - role: httpd/reverseproxy + website: mirrors.centos.org + destname: mirrormanager-mirrorlist + proxyurl: http://localhost:10002 + when: env == "staging" + - role: httpd/reverseproxy website: download.fedoraproject.org destname: mirrormanager-redirector diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 59ed9cbb26..67922567aa 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -153,6 +153,13 @@ - www.fedoramirror.net cert_name: "{{wildcard_cert_name}}" + - role: httpd/website + site_name: mirrors.centos.org + server_aliases: + - mirrors.stg.centos.org + cert_name: "{{mirrors_centos_org_cert_name}}" + when: env == "staging" + - role: httpd/website site_name: src.fedoraproject.org server_aliases: [src.stg.fedoraproject.org]