attempt to make letsencrypt take over for fedorahosted.org

This commit is contained in:
Stephen Smoogen 2020-02-05 21:47:22 +00:00 committed by Pierre-Yves Chibon
parent 042b730bb0
commit 345a05bb0c
3 changed files with 13 additions and 18 deletions

View file

@ -19,9 +19,9 @@
certname: wildcard-2017.fedoraproject.org certname: wildcard-2017.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.fedoraproject.org.intermediate.cert SSLCertificateChainFile: wildcard-2017.fedoraproject.org.intermediate.cert
- role: httpd/certificate # - role: httpd/certificate
certname: wildcard-2017.fedorahosted.org # certname: wildcard-2017.fedorahosted.org
SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert # SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
- role: httpd/certificate - role: httpd/certificate
certname: wildcard-2017.id.fedoraproject.org certname: wildcard-2017.id.fedoraproject.org

View file

@ -550,10 +550,11 @@
website: port389.org website: port389.org
target: https://directory.fedoraproject.org/ target: https://directory.fedoraproject.org/
- role: httpd/redirect # comment out 2020-02-05 .. this has been broken for 2 years
shortname: k12linux # - role: httpd/redirect
website: k12linux.org # shortname: k12linux
target: https://fedorahosted.org/k12linux/ # website: k12linux.org
# target: https://fedorahosted.org/k12linux/
- role: httpd/redirect - role: httpd/redirect
shortname: dogtagpki shortname: dogtagpki

View file

@ -746,8 +746,8 @@
site_name: lists.fedorahosted.org site_name: lists.fedorahosted.org
server_aliases: [lists.stg.fedorahosted.org] server_aliases: [lists.stg.fedorahosted.org]
sslonly: true sslonly: true
SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert certbot: true
cert_name: wildcard-2017.fedorahosted.org tags: fedorahosted
- role: httpd/website - role: httpd/website
site_name: "id{{ env_suffix }}.fedoraproject.org" site_name: "id{{ env_suffix }}.fedoraproject.org"
@ -1007,15 +1007,9 @@
- role: httpd/website - role: httpd/website
site_name: fedorahosted.org site_name: fedorahosted.org
sslonly: true sslonly: true
server_aliases: [bzr.fedorahosted.org hg.fedorahosted.org svn.fedorahosted.org] server_aliases: [git.fedorahosted.org bzr.fedorahosted.org hg.fedorahosted.org svn.fedorahosted.org]
SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert certbot: true
cert_name: wildcard-2017.fedorahosted.org tags: fedorahosted
- role: httpd/website
site_name: git.fedorahosted.org
sslonly: true
SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
cert_name: wildcard-2017.fedorahosted.org
# planet.fedoraproject.org is not to be used, it's fedoraplanet.org # planet.fedoraproject.org is not to be used, it's fedoraplanet.org
# We only have it here so we can redirect it with the correct cert # We only have it here so we can redirect it with the correct cert