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

Merge pull request #704 from downsj2/master

Browse source 
Fix default paths for Amazon Linux
This commit is contained in:
TP Honey 2015-11-19 19:50:52 +00:00
commit 721c162b50
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
manifests/params.pp
View file

@ -42,7 +42,7 @@ class postgresql::params inherits postgresql::globals {
$service_name = pick($service_name, 'postgresql')
$bindir = pick($bindir, '/usr/bin')
$datadir = $::operatingsystem ? {
'Amazon' => pick($datadir, '/var/lib/pgsql9/data'),
'Amazon' => pick($datadir, "/var/lib/pgsql${package_version}/data"),
default => pick($datadir, '/var/lib/pgsql/data'),
}
$confdir = pick($confdir, $datadir)
@ -55,10 +55,16 @@ class postgresql::params inherits postgresql::globals {
$docs_package_name = pick($docs_package_name, "postgresql${package_version}-docs")
$plperl_package_name = pick($plperl_package_name, "postgresql${package_version}-plperl")
$plpython_package_name = pick($plpython_package_name, "postgresql${package_version}-plpython")
$service_name = pick($service_name, "postgresql-${version}")
$bindir = pick($bindir, "/usr/pgsql-${version}/bin")
$service_name = $::operatingsystem ? {
'Amazon' => pick($service_name, "postgresql${version}"),
default => pick($service_name, "postgresql-${version}"),
}
$bindir = $::operatingsystem ? {
'Amazon' => pick($bindir, '/usr/bin'),
default => pick($bindir, "/usr/pgsql-${version}/bin"),
}
$datadir = $::operatingsystem ? {
'Amazon' => pick($datadir, "/var/lib/pgsql9/${version}/data"),
'Amazon' => pick($datadir, "/var/lib/pgsql${package_version}/data"),
default => pick($datadir, "/var/lib/pgsql/${version}/data"),
}
$confdir = pick($confdir, $datadir)

2
spec/unit/classes/server/initdb_spec.rb
View file

@ -30,7 +30,7 @@ describe 'postgresql::server::initdb', :type => :class do
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
}
end
it { is_expected.to contain_file('/var/lib/pgsql9/data').with_ensure('directory') }
it { is_expected.to contain_file('/var/lib/pgsql92/data').with_ensure('directory') }
end
end