Skip to content

Commit aac615c

Browse files
committed
P:puppet::puppetdb: Fix hardcoded TLS cert paths in nginx config
1 parent 45375f9 commit aac615c

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

modules/profile/manifests/puppet/puppetdb.pp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@
2525
default => '/var/lib/puppetdb',
2626
}
2727

28+
$ssl_cert_path = debian::codename() ? {
29+
'bullseye' => '/etc/puppetlabs/puppetdb/ssl/public.pem',
30+
default => "/var/lib/puppet/ssl/certs/${facts['networking']['fqdn']}.pem",
31+
}
32+
$ssl_key_path = debian::codename() ? {
33+
'bullseye' => '/etc/puppetlabs/puppetdb/ssl/private.pem',
34+
default => "/var/lib/puppet/ssl/private_keys/${facts['networking']['fqdn']}.pem",
35+
}
36+
$ssl_ca_path = debian::codename() ? {
37+
'bullseye' => '/etc/puppetlabs/puppetdb/ssl/ca.pem',
38+
default => '/etc/puppet/puppetserver/ca/ca_crt.pem',
39+
}
40+
2841
file { "${config_path}/cert-allowlist":
2942
ensure => file,
3043
mode => '0444',

modules/profile/templates/puppet/puppetdb/site.nginx.erb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ server {
1515
proxy_redirect off;
1616
proxy_buffering off;
1717

18-
proxy_ssl_certificate /etc/puppetlabs/puppetdb/ssl/public.pem;
19-
proxy_ssl_certificate_key /etc/puppetlabs/puppetdb/ssl/private.pem;
20-
proxy_ssl_trusted_certificate /etc/puppetlabs/puppetdb/ssl/ca.pem;
18+
proxy_ssl_certificate <%= @ssl_cert_path %>;
19+
proxy_ssl_certificate_key <%= @ssl_key_path %>;
20+
proxy_ssl_trusted_certificate <%= @ssl_ca_path %>;
2121
proxy_ssl_verify on;
2222
proxy_ssl_protocols TLSv1.3;
2323
}
@@ -27,9 +27,9 @@ server {
2727
proxy_redirect off;
2828
proxy_buffering off;
2929

30-
proxy_ssl_certificate /etc/puppetlabs/puppetdb/ssl/public.pem;
31-
proxy_ssl_certificate_key /etc/puppetlabs/puppetdb/ssl/private.pem;
32-
proxy_ssl_trusted_certificate /etc/puppetlabs/puppetdb/ssl/ca.pem;
30+
proxy_ssl_certificate <%= @ssl_cert_path %>;
31+
proxy_ssl_certificate_key <%= @ssl_key_path %>;
32+
proxy_ssl_trusted_certificate <%= @ssl_ca_path %>;
3333
proxy_ssl_verify on;
3434
proxy_ssl_protocols TLSv1.3;
3535
}

0 commit comments

Comments
 (0)