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

Merge pull request #5623 from inspec/nm/apache-conf-merge-fix

Browse source 
Fix merging of included conf and main conf params in apache conf
This commit is contained in:
Clinton Wolfe 2021-08-23 22:39:50 -04:00 • committed by GitHub
commit 026788e294
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/inspec/resources/apache_conf.rb
View file

@ -82,7 +82,7 @@ module Inspec::Resources
end
end
@params.merge!(params)
@params.merge!(params) { |key, current_val, new_val| [*current_val].to_a + [*new_val].to_a }
to_read = to_read.drop(1)
to_read += include_files(params).find_all do |fp|