mirror of
https://github.com/inspec/inspec
synced 2024-11-23 13:13:22 +00:00
make postgres resource working in mock runner (for inspec check) (#1961)
* make postgres resource working in mock runner (for inspec check) Signed-off-by: Christoph Hartmann <chris@lollyrock.com> * keep nil for empty states Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
This commit is contained in:
parent
3bb98fa1e8
commit
9ac36bca30
2 changed files with 11 additions and 3 deletions
|
@ -11,8 +11,7 @@ module Inspec::Resources
|
|||
|
||||
attr_reader :service, :data_dir, :conf_dir, :conf_path, :version, :cluster
|
||||
def initialize
|
||||
os = inspec.os
|
||||
if os.debian?
|
||||
if inspec.os.debian?
|
||||
#
|
||||
# https://wiki.debian.org/PostgreSql
|
||||
#
|
||||
|
@ -40,8 +39,14 @@ module Inspec::Resources
|
|||
@service = 'postgresql'
|
||||
@service += "-#{@version}" if @version.to_f >= 9.4
|
||||
@conf_dir ||= @data_dir
|
||||
|
||||
verify_dirs
|
||||
@conf_path = File.join @conf_dir, 'postgresql.conf'
|
||||
if !@version.nil? && !@conf_dir.empty?
|
||||
@conf_path = File.join @conf_dir, 'postgresql.conf'
|
||||
else
|
||||
@conf_path = nil
|
||||
return skip_resource 'Seems like PostgreSQL is not installed on your system'
|
||||
end
|
||||
end
|
||||
|
||||
def to_s
|
||||
|
|
|
@ -24,6 +24,9 @@ module Inspec::Resources
|
|||
|
||||
def initialize(conf_path = nil)
|
||||
@conf_path = conf_path || inspec.postgres.conf_path
|
||||
if @conf_path.nil?
|
||||
return skip_resource 'PostgreSQL conf path is not set'
|
||||
end
|
||||
@conf_dir = File.expand_path(File.dirname(@conf_path))
|
||||
@files_contents = {}
|
||||
@content = nil
|
||||
|
|
Loading…
Reference in a new issue