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

staging: update wildcard cert to new 2024 one

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2024-02-02 11:15:25 -08:00
parent 33e2b6433e
commit da4c78f798
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inventory/group_vars/staging
View file

@ -49,9 +49,9 @@ ocp_wildcard_int_file: wildcard-2023.apps.ocp.stg.fedoraproject.org.intermediate
ocp_wildcard_key_file: wildcard-2023.apps.ocp.stg.fedoraproject.org.key ocp_wildcard_key_file: wildcard-2023.apps.ocp.stg.fedoraproject.org.key
# RIP, FAS # RIP, FAS
primary_auth_source: ipa primary_auth_source: ipa
SSLCertificateChainFile: wildcard-2023.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2024.stg.fedoraproject.org.intermediate.cert
wildcard_cert_file: wildcard-2023.stg.fedoraproject.org.cert wildcard_cert_file: wildcard-2024.stg.fedoraproject.org.cert
# This is the wildcard certname for our stg proxies. # This is the wildcard certname for our stg proxies.
wildcard_cert_name: wildcard-2023.stg.fedoraproject.org wildcard_cert_name: wildcard-2024.stg.fedoraproject.org
wildcard_int_file: wildcard-2023.stg.fedoraproject.org.intermediate.cert wildcard_int_file: wildcard-2024.stg.fedoraproject.org.intermediate.cert
wildcard_key_file: wildcard-2023.stg.fedoraproject.org.key wildcard_key_file: wildcard-2024.stg.fedoraproject.org.key

8
playbooks/include/proxies-certificates.yml
View file

@ -28,13 +28,13 @@
SSLCertificateChainFile: wildcard-2024.id.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2024.id.fedoraproject.org.intermediate.cert
- role: httpd/certificate - role: httpd/certificate
certname: wildcard-2023.stg.fedoraproject.org certname: wildcard-2024.stg.fedoraproject.org
SSLCertificateChainFile: wildcard-2023.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2024.stg.fedoraproject.org.intermediate.cert
when: env == "staging" when: env == "staging"
- role: httpd/certificate - role: httpd/certificate
certname: wildcard-2023.stg.fedoraproject.org certname: wildcard-2024.stg.fedoraproject.org
SSLCertificateChainFile: wildcard-2023.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2024.stg.fedoraproject.org.intermediate.cert
when: env == "staging" when: env == "staging"
- role: httpd/certificate - role: httpd/certificate

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

@ -776,7 +776,7 @@
site_name: taskotron.stg.fedoraproject.org site_name: taskotron.stg.fedoraproject.org
server_aliases: [taskotron.stg.fedoraproject.org] server_aliases: [taskotron.stg.fedoraproject.org]
# Set this explicitly to stg here.. as per the original puppet config. # Set this explicitly to stg here.. as per the original puppet config.
SSLCertificateChainFile: wildcard-2023.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2024.stg.fedoraproject.org.intermediate.cert
sslonly: true sslonly: true
cert_name: "{{wildcard_cert_name}}" cert_name: "{{wildcard_cert_name}}"
when: env == "staging" when: env == "staging"
@ -785,7 +785,7 @@
site_name: resultsdb.stg.fedoraproject.org site_name: resultsdb.stg.fedoraproject.org
server_aliases: [resultsdb.stg.fedoraproject.org] server_aliases: [resultsdb.stg.fedoraproject.org]
# Set this explicitly to stg here.. as per the original puppet config. # Set this explicitly to stg here.. as per the original puppet config.
SSLCertificateChainFile: wildcard-2023.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2024.stg.fedoraproject.org.intermediate.cert
sslonly: true sslonly: true
cert_name: "{{wildcard_cert_name}}" cert_name: "{{wildcard_cert_name}}"
when: env == "staging" when: env == "staging"
@ -849,7 +849,7 @@
# via plain http for openid identity support # via plain http for openid identity support
sslonly: false sslonly: false
cert_name: "{{wildcard_cert_name}}" cert_name: "{{wildcard_cert_name}}"
SSLCertificateChainFile: wildcard-2023.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2024.stg.fedoraproject.org.intermediate.cert
tags: tags:
- id.fedoraproject.org - id.fedoraproject.org
when: env == "staging" when: env == "staging"