Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Specify rhel7 as the scap security guide platform #275

Merged
merged 3 commits into from
Oct 3, 2017
Merged

Specify rhel7 as the scap security guide platform #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15da358
Specify rhel7 as the scap security guide platform
carbonin Sep 26, 2017
6ef7f83
Also add platform to ssg_available? method
carbonin Sep 28, 2017
046c081
Bump linux_admin version to ~> 1.0
carbonin Oct 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/gems/pending/appliance_console/scap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def lockdown
require 'yaml'
scap_config = YAML.load_file(yaml_filename)
begin
LinuxAdmin::Scap.new.lockdown(*scap_config['rules'], scap_config['values'])
LinuxAdmin::Scap.new("rhel7").lockdown(*scap_config['rules'], scap_config['values'])
rescue => e
say("Configuration failed: #{e.message}")
else
Expand All @@ -31,7 +31,7 @@ def packages_installed?
if !LinuxAdmin::Scap.openscap_available?
say("OpenSCAP has not been installed")
false
elsif !LinuxAdmin::Scap.ssg_available?
elsif !LinuxAdmin::Scap.ssg_available?("rhel7")
say("SCAP Security Guide has not been installed")
false
else
Expand Down
2 changes: 1 addition & 1 deletion manageiq-gems-pending.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency "binary_struct", "~> 2.1"
s.add_runtime_dependency "bundler", ">= 1.8.4" # rails-assets requires bundler >= 1.8.4, see: https://rails-assets.org/
s.add_runtime_dependency "highline", "~> 1.6.21" # Needed for the appliance_console
s.add_runtime_dependency "linux_admin", "~> 0.20.2"
s.add_runtime_dependency "linux_admin", "~> 1.0"
s.add_runtime_dependency "log4r", "= 1.1.8"
s.add_runtime_dependency "memoist", "~> 0.15.0"
s.add_runtime_dependency "more_core_extensions", "~> 3.4"
Expand Down