Skip to content

Commit 83adcc6

Browse files
flexible value for auth_method in pg_hba.conf if passwords are used
1 parent 5d396bb commit 83adcc6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
$manage_selinux = pick($manage_selinux, false)
2626
$package_ensure = 'present'
2727
$module_workdir = pick($module_workdir,'/tmp')
28-
$password_encryption = if versioncmp($version, '14') >= 0 { 'scram-sha-256' } else { undef }
28+
$password_encryption = if versioncmp($version, '14') >= 0 { 'scram-sha-256' } else { 'md5' }
2929
$extra_systemd_config = undef
3030
$manage_datadir = true
3131
$manage_logdir = true

manifests/server.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
Boolean $manage_datadir = $postgresql::params::manage_datadir,
183183
Boolean $manage_logdir = $postgresql::params::manage_logdir,
184184
Boolean $manage_xlogdir = $postgresql::params::manage_xlogdir,
185-
Optional[Postgresql::Pg_password_encryption] $password_encryption = $postgresql::params::password_encryption,
185+
Postgresql::Pg_password_encryption $password_encryption = $postgresql::params::password_encryption,
186186
Optional[String] $extra_systemd_config = $postgresql::params::extra_systemd_config,
187187

188188
Hash[String, Hash] $roles = {},

manifests/server/instance/config.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
Boolean $service_enable = $postgresql::server::service_enable,
7171
Optional[String[1]] $log_line_prefix = $postgresql::server::log_line_prefix,
7272
Optional[String[1]] $timezone = $postgresql::server::timezone,
73-
Optional[Postgresql::Pg_password_encryption] $password_encryption = $postgresql::server::password_encryption,
73+
Postgresql::Pg_password_encryption $password_encryption = $postgresql::server::password_encryption,
7474
Optional[String] $extra_systemd_config = $postgresql::server::extra_systemd_config,
7575
) {
7676
if $port =~ String {
@@ -116,7 +116,7 @@
116116
type => 'host',
117117
user => $user,
118118
address => '127.0.0.1/32',
119-
auth_method => 'md5',
119+
auth_method => $password_encryption,
120120
order => 3;
121121

122122
"deny access to postgresql user for instance ${name}":
@@ -129,13 +129,13 @@
129129
"allow access to all users for instance ${name}":
130130
type => 'host',
131131
address => $ip_mask_allow_all_users,
132-
auth_method => 'md5',
132+
auth_method => $password_encryption,
133133
order => 100;
134134

135135
"allow access to ipv6 localhost for instance ${name}":
136136
type => 'host',
137137
address => '::1/128',
138-
auth_method => 'md5',
138+
auth_method => $password_encryption,
139139
order => 101;
140140
}
141141
}

0 commit comments

Comments
 (0)