Skip to content

Commit 7018a5f

Browse files
committed
Merge pull request puppetlabs#582 from rvstaveren/rvstaveren-extension-postgresql_psql-fix
postgresql::server::extension needs to have defaults for postgresql_psql
2 parents 88dc7ee + 05c466c commit 7018a5f

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

manifests/server/extension.pp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
$package_name = undef,
66
$package_ensure = undef,
77
) {
8+
$user = $postgresql::server::user
9+
$group = $postgresql::server::group
10+
$psql_path = $postgresql::server::psql_path
11+
$port = $postgresql::server::port
12+
13+
# Set the defaults for the postgresql_psql resource
14+
Postgresql_psql {
15+
psql_user => $user,
16+
psql_group => $group,
17+
psql_path => $psql_path,
18+
port => $port,
19+
}
20+
821
case $ensure {
922
'present': {
1023
$command = "CREATE EXTENSION ${name}"

manifests/server/initdb.pp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
$locale = $postgresql::server::locale
1010
$group = $postgresql::server::group
1111
$user = $postgresql::server::user
12+
$psql_path = $postgresql::server::psql_path
13+
$port = $postgresql::server::port
14+
15+
# Set the defaults for the postgresql_psql resource
16+
Postgresql_psql {
17+
psql_user => $user,
18+
psql_group => $group,
19+
psql_path => $psql_path,
20+
port => $port,
21+
}
1222

1323
# Make sure the data directory exists, and has the correct permissions.
1424
file { $datadir:

0 commit comments

Comments
 (0)