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

move to using wildcard-2020 for .id and .stg

Browse source
This commit is contained in:
Stephen Smoogen 2020-04-01 21:32:09 +00:00 • committed by Pierre-Yves Chibon
parent 86b41ecd91
commit d7c8079556
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
inventory/group_vars/staging
View file

@ -7,10 +7,10 @@ env_short: stg
host_group: staging host_group: staging
# This is the wildcard certname for our stg proxies. # This is the wildcard certname for our stg proxies.
wildcard_cert_name: wildcard-2017.stg.fedoraproject.org wildcard_cert_name: wildcard-2020.stg.fedoraproject.org
wildcard_cert_file: wildcard-2017.stg.fedoraproject.org.cert wildcard_cert_file: wildcard-2020.stg.fedoraproject.org.cert
wildcard_key_file: wildcard-2017.stg.fedoraproject.org.key wildcard_key_file: wildcard-2020.stg.fedoraproject.org.key
wildcard_int_file: wildcard-2017.stg.fedoraproject.org.intermediate.cert wildcard_int_file: wildcard-2020.stg.fedoraproject.org.intermediate.cert
# This is the openshift wildcard cert for stg # This is the openshift wildcard cert for stg
os_wildcard_cert_name: wildcard-2017.app.os.stg.fedoraproject.org os_wildcard_cert_name: wildcard-2017.app.os.stg.fedoraproject.org

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

@ -20,12 +20,12 @@
SSLCertificateChainFile: wildcard-2020.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2020.fedoraproject.org.intermediate.cert
- role: httpd/certificate - role: httpd/certificate
certname: wildcard-2017.id.fedoraproject.org certname: wildcard-2020.id.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.id.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2020.id.fedoraproject.org.intermediate.cert
- role: httpd/certificate - role: httpd/certificate
certname: wildcard-2017.stg.fedoraproject.org certname: wildcard-2020.stg.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2020.stg.fedoraproject.org.intermediate.cert
when: env == "staging" when: env == "staging"
- role: httpd/certificate - role: httpd/certificate

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

@ -724,7 +724,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-2017.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2020.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"
@ -765,8 +765,8 @@
# Must not be sslonly, because example.id.fedoraproject.org must be reachable # Must not be sslonly, because example.id.fedoraproject.org must be reachable
# via plain http for openid identity support # via plain http for openid identity support
sslonly: false sslonly: false
cert_name: wildcard-2017.id.fedoraproject.org cert_name: wildcard-2020.id.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.id.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2020.id.fedoraproject.org.intermediate.cert
tags: tags:
- id.fedoraproject.org - id.fedoraproject.org
when: env == "production" when: env == "production"
@ -779,7 +779,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-2017.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2020.stg.fedoraproject.org.intermediate.cert
tags: tags:
- id.fedoraproject.org - id.fedoraproject.org
when: env == "staging" when: env == "staging"
@ -838,7 +838,7 @@
site_name: beaker.stg.fedoraproject.org site_name: beaker.stg.fedoraproject.org
server_aliases: [beaker.stg.fedoraproject.org] server_aliases: [beaker.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-2017.stg.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2020.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"