Skip to content

Commit b1596ca

Browse files
committed
tweaks for deploying server certificate
1 parent da5db58 commit b1596ca

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

manifests/globals.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@
133133
$data_checksums = undef,
134134
$timezone = undef,
135135

136+
$certificate_common_name = $::fqdn,
137+
$certificate_days = 3650,
138+
136139
$manage_pg_hba_conf = undef,
137140
$manage_pg_ident_conf = undef,
138141
$manage_recovery_conf = undef,

manifests/params.pp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@
2424
$package_ensure = 'present'
2525
$module_workdir = pick($module_workdir,'/tmp')
2626

27+
# following required by postgresql::server::ssl_certificate
28+
$cerificate_days = postgresql::globals::certificate_days
29+
$cerificate_country = undef
30+
$certificate_state = undef
31+
$certificate_locality = undef
32+
$certificate_organization = undef
33+
$certificate_common_name = undef
34+
$certificate_email = undef
35+
2736
# Amazon Linux's OS Family is 'Linux', operating system 'Amazon'.
2837
case $::osfamily {
2938
'RedHat', 'Linux': {

manifests/server.pp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,15 @@
126126

127127
$manage_pg_hba_conf = $postgresql::params::manage_pg_hba_conf,
128128
$manage_pg_ident_conf = $postgresql::params::manage_pg_ident_conf,
129+
130+
$certificate_days = $postgresql::params::certificate_days,
131+
$certificate_country = $postgresql::params::cerificate_country,
132+
$certificate_state = $postgresql::params::certificate_state,
133+
$certificate_locality = $postgresql::params::certificate_locality,
134+
$certificate_organization = $postgresql::params::certificate_organization,
135+
$certificate_common_name = $postgresql::params::certificate_common_name,
136+
$certificate_email = $postgresql::params::certificate_email,
137+
129138
$manage_recovery_conf = $postgresql::params::manage_recovery_conf,
130139
$module_workdir = $postgresql::params::module_workdir,
131140

@@ -135,6 +144,7 @@
135144

136145
#Deprecated
137146
$version = undef,
147+
138148
) inherits postgresql::params {
139149
if $version != undef {
140150
warning('Passing "version" to postgresql::server is deprecated; please use postgresql::globals instead.')

0 commit comments

Comments
 (0)