Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2025-02-16 22:18:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

detect postgres 10 on centos properly

Browse source 
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
This commit is contained in:
Christoph Hartmann 2019-02-25 13:39:17 +01:00
parent 8c37a61494
commit 15c03cf8fc
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/resources/postgres.rb
View file

@ -35,7 +35,12 @@ module Inspec::Resources
end
@service = 'postgresql'
@service += "-#{@version}" if @version.to_f >= 9.4
if @version.to_i >= 10
@service += "-#{@version.to_i}"
elsif @version.to_f >= 9.4
@service += "-#{@version}"
end
@conf_dir ||= @data_dir
verify_dirs
@ -71,6 +76,8 @@ module Inspec::Resources
def locate_data_dir_location_by_version(ver = @version)
dir_list = [
"/var/lib/pgsql/#{ver}/data",
# for 10, the versions are just stored in `10` although their version `10.7`
"/var/lib/pgsql/#{ver.to_i}/data",
'/var/lib/pgsql/data',
'/var/lib/postgres/data',
'/var/lib/postgresql/data',