infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

noc02: setup to use letsencrypt cert. Fixes ticket #8882

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2020-05-05 10:22:37 -07:00
parent 8ccd6841fd
commit 0a034c50d1
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/groups/noc.yml
View file

@ -38,7 +38,7 @@
service: HTTP service: HTTP
host: "nagios-external{{env_suffix}}.fedoraproject.org" host: "nagios-external{{env_suffix}}.fedoraproject.org"
when: datacenter != 'phx2' when: datacenter != 'phx2'
- { role: letsencrypt, site_name: 'nagios-external.fedoraproject.org', when: inventory_hostname.startswith('noc02') }
tasks: tasks:
- import_tasks: "{{ tasks_path }}/2fa_client.yml" - import_tasks: "{{ tasks_path }}/2fa_client.yml"

7
roles/nagios_server/templates/httpd/0_nagios-external.conf.j2
View file

@ -1,5 +1,6 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerName nagios-external.fedoraproject.org ServerName nagios-external.fedoraproject.org
ProxyPass "/.well-known/acme-challenge" "http://certgetter01/.well-known/acme-challenge"
Redirect permanent / https://nagios-external.fedoraproject.org/ Redirect permanent / https://nagios-external.fedoraproject.org/
</VirtualHost> </VirtualHost>
@ -11,7 +12,7 @@
SSLCipherSuite {{ ssl_ciphers }} SSLCipherSuite {{ ssl_ciphers }}
Header always add Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" Header always add Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
SSLCertificateFile /etc/pki/tls/certs/noc02.fedoraproject.org.cert SSLCertificateFile /etc/pki/tls/certs/nagios-external.fedoraproject.org.cert
SSLCertificateChainFile /etc/pki/tls/certs/noc02.fedoraproject.org.intermediate.cert SSLCertificateChainFile /etc/pki/tls/certs/nagios-external.fedoraproject.org.intermediate.cert
SSLCertificateKeyFile /etc/pki/tls/certs/noc02.fedoraproject.org.key SSLCertificateKeyFile /etc/pki/tls/certs/nagios-external.fedoraproject.org.key
</VirtualHost> </VirtualHost>