diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 34ad9a4f33..009eaad7f4 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -294,10 +294,10 @@ virt_install_command_two_nic_unsafe: virt-install -n {{ inventory_hostname }} -- vpn: False # This is the wildcard certname for our proxies. It has a different name for # the staging group and is used in the proxies.yml playbook. -wildcard_cert_name: wildcard-2024.fedoraproject.org -wildcard_crt_file: wildcard-2024.fedoraproject.org.cert -wildcard_int_file: wildcard-2024.fedoraproject.org.intermediate.cert -wildcard_key_file: wildcard-2024.fedoraproject.org.key +wildcard_cert_name: wildcard-2025.fedoraproject.org +wildcard_crt_file: wildcard-2025.fedoraproject.org.cert +wildcard_int_file: wildcard-2025.fedoraproject.org.intermediate.cert +wildcard_key_file: wildcard-2025.fedoraproject.org.key # # say if we want the apache role dependency for mod_wsgi or not # In some cases we want mod_wsgi and no apache (for python3 httpaio stuff) diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml index c5e574464d..320491fd54 100644 --- a/playbooks/include/proxies-certificates.yml +++ b/playbooks/include/proxies-certificates.yml @@ -17,12 +17,12 @@ - role: httpd/mod_ssl - role: httpd/certificate - certname: wildcard-2024.fedoraproject.org - SSLCertificateChainFile: wildcard-2024.fedoraproject.org.intermediate.cert + certname: wildcard-2025.fedoraproject.org + SSLCertificateChainFile: wildcard-2025.fedoraproject.org.intermediate.cert - role: httpd/certificate - certname: wildcard-2024.fedoraproject.org - SSLCertificateChainFile: wildcard-2024.fedoraproject.org.intermediate.cert + certname: wildcard-2025.fedoraproject.org + SSLCertificateChainFile: wildcard-2025.fedoraproject.org.intermediate.cert - role: httpd/certificate certname: wildcard-2024.id.fedoraproject.org diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 52a7d611ba..90e866aad3 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -989,14 +989,14 @@ - role: httpd/website site_name: nagios.fedoraproject.org server_aliases: [nagios.stg.fedoraproject.org] - SSLCertificateChainFile: wildcard-2024.fedoraproject.org.intermediate.cert + SSLCertificateChainFile: wildcard-2025.fedoraproject.org.intermediate.cert sslonly: true cert_name: "{{wildcard_cert_name}}" - role: httpd/website site_name: nagios-rdu3.fedoraproject.org server_aliases: [nagios-rdu3.stg.fedoraproject.org] - SSLCertificateChainFile: wildcard-2024.fedoraproject.org.intermediate.cert + SSLCertificateChainFile: wildcard-2025.fedoraproject.org.intermediate.cert sslonly: true cert_name: "{{wildcard_cert_name}}" diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml index 2ce10f8b19..de46442f90 100644 --- a/roles/download/tasks/main.yml +++ b/roles/download/tasks/main.yml @@ -56,13 +56,13 @@ - selinux - name: Copy wildcard cert from puppet private - ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.cert" dest=/etc/pki/tls/certs/wildcard-2024.fedoraproject.org.cert owner=root group=root mode=0644 + ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2025.fedoraproject.org.cert" dest=/etc/pki/tls/certs/wildcard-2025.fedoraproject.org.cert owner=root group=root mode=0644 - name: Copy wildcard key from puppet private - ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.key" dest=/etc/pki/tls/private/wildcard-2024.fedoraproject.org.key owner=root group=root mode=0600 + ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2025.fedoraproject.org.key" dest=/etc/pki/tls/private/wildcard-2025.fedoraproject.org.key owner=root group=root mode=0600 - name: Copy intermediate wildcard cert from puppet private - ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.intermediate.cert" dest=/etc/pki/tls/certs/wildcard-2024.fedoraproject.org.intermediate.cert owner=root group=root mode=0644 + ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2025.fedoraproject.org.intermediate.cert" dest=/etc/pki/tls/certs/wildcard-2025.fedoraproject.org.intermediate.cert owner=root group=root mode=0644 - name: Configure httpd dl main conf ansible.builtin.template: src=httpd/dl.fedoraproject.org.conf dest=/etc/httpd/conf.d/dl.fedoraproject.org.conf diff --git a/roles/httpd/website/defaults/main.yml b/roles/httpd/website/defaults/main.yml index 9c0a26e159..80d4eb31d3 100644 --- a/roles/httpd/website/defaults/main.yml +++ b/roles/httpd/website/defaults/main.yml @@ -9,7 +9,7 @@ server_admin: webmaster@fedoraproject.org certbot: false ssl: true sslonly: false -SSLCertificateChainFile: wildcard-2024.fedoraproject.org.intermediate.cert +SSLCertificateChainFile: wildcard-2025.fedoraproject.org.intermediate.cert gzip: false stssubdomains: true # set to true to enable the proxy to redirect the http01 challenge