opuppet/module-postgresql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #582 from rvstaveren/rvstaveren-extension-postgresql_psql-fix

Browse source 
postgresql::server::extension needs to have defaults for postgresql_psql
This commit is contained in:
Hunter Haugen 2015-03-19 10:30:02 -07:00
commit 7018a5f5ad
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
manifests/server/extension.pp
View file

@ -5,6 +5,19 @@ define postgresql::server::extension (
$package_name = undef, $package_name = undef,
$package_ensure = undef, $package_ensure = undef,
) { ) {
$user = $postgresql::server::user
$group = $postgresql::server::group
$psql_path = $postgresql::server::psql_path
$port = $postgresql::server::port
# Set the defaults for the postgresql_psql resource
Postgresql_psql {
psql_user => $user,
psql_group => $group,
psql_path => $psql_path,
port => $port,
}
case $ensure { case $ensure {
'present': { 'present': {
$command = "CREATE EXTENSION ${name}" $command = "CREATE EXTENSION ${name}"

10
manifests/server/initdb.pp
View file

@ -9,6 +9,16 @@ class postgresql::server::initdb {
$locale = $postgresql::server::locale $locale = $postgresql::server::locale
$group = $postgresql::server::group $group = $postgresql::server::group
$user = $postgresql::server::user $user = $postgresql::server::user
$psql_path = $postgresql::server::psql_path
$port = $postgresql::server::port
# Set the defaults for the postgresql_psql resource
Postgresql_psql {
psql_user => $user,
psql_group => $group,
psql_path => $psql_path,
port => $port,
}
# Make sure the data directory exists, and has the correct permissions. # Make sure the data directory exists, and has the correct permissions.
file { $datadir: file { $datadir: