Skip to content

Add option to set the source of the ssl certs and optionally use the puppet certs #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add option to set the source of the ssl certs and optionally use the puppet certs #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,23 @@ Contents of your SSL certificate, as a string.

Contents of your SSL CA certificate, as a string.

#### `ssl_use_puppet_certs`

A boolean switch to enable or disable copying the puppet SSL certs into your
`ssl_dir`. Default is `false`.

#### `ssl_key_source`

Source of your SSL key, as a uri.

#### `ssl_cert_source`

Source of your SSL certificate, as a uri.

#### `ssl_ca_cert_source`

Source of your SSL CA certificate, as a uri.

#### `manage_firewall`

If `true`, puppet will manage your iptables rules for PuppetDB via the
Expand Down
4 changes: 4 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@
$ssl_key = undef
$ssl_cert = undef
$ssl_ca_cert = undef
$ssl_use_puppet_certs = false
$ssl_key_source = undef
$ssl_cert_source = undef
$ssl_ca_cert_source = undef

# certificate used by PuppetDB SSL Configuration
$ssl_key_pk8_path = regsubst($ssl_key_path, '.pem', '.pk8')
Expand Down
29 changes: 24 additions & 5 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
$ssl_key = $puppetdb::params::ssl_key,
$ssl_cert = $puppetdb::params::ssl_cert,
$ssl_ca_cert = $puppetdb::params::ssl_ca_cert,
Boolean $ssl_use_puppet_certs = $puppetdb::params::ssl_use_puppet_certs,
$ssl_key_source = $puppetdb::params::ssl_key_source,
$ssl_cert_source = $puppetdb::params::ssl_cert_source,
$ssl_ca_cert_source = $puppetdb::params::ssl_ca_cert_source,
$ssl_protocols = $puppetdb::params::ssl_protocols,
$postgresql_ssl_on = $puppetdb::params::postgresql_ssl_on,
$cipher_suites = $puppetdb::params::cipher_suites,
Expand Down Expand Up @@ -231,33 +235,48 @@
database_max_pool_size => $read_database_max_pool_size,
}

if $ssl_deploy_certs {
if $ssl_deploy_certs or $ssl_use_puppet_certs {

if $ssl_use_puppet_certs {
$_ssl_key_source = "file:///${::settings::ssldir}/private_keys/${::clientcert}.pem"
$_ssl_cert_source = "file:///${::settings::ssldir}/certs/${::clientcert}.pem"
$_ssl_ca_cert_source = "file:///${::settings::ssldir}/certs/ca.pem"
} else {
$_ssl_key_source = $ssl_key_source
$_ssl_cert_source = $ssl_cert_source
$_ssl_ca_cert_source = $ssl_ca_cert_source
}

file {
$ssl_dir:
ensure => directory,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0700';
ensure => directory,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0700',
require => Package[$puppetdb_package];
$ssl_key_path:
ensure => file,
content => $ssl_key,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0600',
source => $_ssl_key_source,
notify => Service[$puppetdb_service];
$ssl_cert_path:
ensure => file,
content => $ssl_cert,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0600',
source => $_ssl_cert_source,
notify => Service[$puppetdb_service];
$ssl_ca_cert_path:
ensure => file,
content => $ssl_ca_cert,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0600',
source => $_ssl_ca_cert_source,
notify => Service[$puppetdb_service];
}
}
Expand Down