Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

puppet: Specify CentOS specific path to ca certificates for nginx.

This commit is contained in:
rht 2019-12-19 15:32:10 +00:00 committed by Tim Abbott
parent d5284b177e
commit 70dfb423e4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
puppet/zulip/manifests/nginx.pp
View File

@ -58,6 +58,11 @@ class zulip::nginx {
source => 'puppet:///modules/zulip/nginx/dhparam.pem',
}
if $::osfamily == 'debian' {
$ca_crt = '/etc/ssl/certs/ca-certificates.crt'
} else {
$ca_crt = '/etc/pki/tls/certs/ca-bundle.crt'
}
file { '/etc/nginx/nginx.conf':
ensure => file,
require => Package[$zulip::common::nginx, 'ca-certificates'],

2
puppet/zulip/templates/nginx.conf.template.erb
View File

@ -62,7 +62,7 @@ http {
ssl_prefer_server_ciphers off;
ssl_stapling on;
ssl_stapling_verify on;
ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;
ssl_trusted_certificate <%= @ca_crt %>;
include /etc/nginx/conf.d/*.conf;