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

pagure / staging: use normal cert, not bundle for stunnel

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2021-09-08 12:28:16 -07:00
parent af53fd848b
commit 1176de7808
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
playbooks/include/proxies-reverseproxy.yml
View file

@ -366,7 +366,6 @@
website: mirrors.centos.org website: mirrors.centos.org
destname: mirrormanager-mirrorlist destname: mirrormanager-mirrorlist
proxyurl: http://localhost:10002 proxyurl: http://localhost:10002
when: env == "staging"
- role: httpd/reverseproxy - role: httpd/reverseproxy
website: download.fedoraproject.org website: download.fedoraproject.org

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

@ -158,8 +158,7 @@
server_aliases: server_aliases:
- mirrors.stg.centos.org - mirrors.stg.centos.org
cert_name: "{{mirrors_centos_org_cert_name}}" cert_name: "{{mirrors_centos_org_cert_name}}"
SSLCertificateChainFile: mirrors.stg.centos.org.intermediate.cert SSLCertificateChainFile: "mirrors{{env_suffix}}.centos.org.intermediate.cert"
when: env == "staging"
- role: httpd/website - role: httpd/website
site_name: src.fedoraproject.org site_name: src.fedoraproject.org

2
roles/pagure/templates/stunnel-conf.j2
View file

@ -1,5 +1,5 @@
{% if env == 'pagure-staging' %} {% if env == 'pagure-staging' %}
cert = /etc/pki/tls/certs/stg.pagure.io.bundle.cert cert = /etc/pki/tls/certs/stg.pagure.io.cert
key = /etc/pki/tls/private/stg.pagure.io.key key = /etc/pki/tls/private/stg.pagure.io.key
{% else %} {% else %}
cert = /etc/pki/tls/certs/pagure.io.cert cert = /etc/pki/tls/certs/pagure.io.cert