Download:
child 92:00605a68a8b1
parent 90:ac596e288f18
91:e66349b7f9c6
Anton Shestakov <av6@dwimlabs.net>, Mon, 04 Apr 2016 08:17:11 +0800
provision: use one certificate for nginx and prosody

2 файлов изменено, 3 вставок(+), 5 удалений(-) [+]
contrib/provision/playbook.yml file | annotate | diff | comparison | revisions
contrib/provision/roles/tram-im/templates/etc/prosody/conf.avail/tram-im.cfg.lua file | annotate | diff | comparison | revisions
--- a/contrib/provision/playbook.yml Mon Apr 04 08:16:00 2016 +0800
+++ b/contrib/provision/playbook.yml Mon Apr 04 08:17:11 2016 +0800
@@ -28,9 +28,7 @@
- role: common
tags: [common]
- role: certs
- selfsigned:
- - '{{ domain }}'
- - 'muc.{{ domain }}'
+ selfsigned: ['{{ domain }}']
tags: [certs]
- role: nginx
tags: [nginx]
--- a/contrib/provision/roles/tram-im/templates/etc/prosody/conf.avail/tram-im.cfg.lua Mon Apr 04 08:16:00 2016 +0800
+++ b/contrib/provision/roles/tram-im/templates/etc/prosody/conf.avail/tram-im.cfg.lua Mon Apr 04 08:17:11 2016 +0800
@@ -8,8 +8,8 @@
admins = { "{{ admin_jid }}" }
ssl = {
- key = "/etc/ssl/selfsigned/muc.{{ domain }}/clean.key";
- certificate = "/etc/ssl/selfsigned/muc.{{ domain }}/selfsigned.pem";
+ certificate = "{{ ssl_cert }}";
+ key = "{{ ssl_key }}";
dhparam = "/etc/prosody/dh-2048.pem";
}