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

Jump to bottom

Benchmark 3.1.1 Updates #257

Merged
merged 76 commits into from
Sep 15, 2021
Merged

Benchmark 3.1.1 Updates #257

merged 76 commits into from
Sep 15, 2021

Conversation

georgenalen
Copy link
Contributor

Overall Review of Changes:
Updates to conform to the version 3.1.1 version of the benchmarks. Addressed a couple of issues and implemented GitHub templates for issues and PR's.

Issue Fixes:
PR #248 - Allow toggling of OS check
PR #247 - Fixed some copy/paste errors with STIG references
PR #250 - Added missing step

Enhancements:

  • Lint fixes
  • new mount setup and layout
  • Benchmark 3.1.1 updates

How has this been tested?:
Local RHEL7 and CENTOS7 as well as testing pipeline

@uk-bolly
Section_1 updates for 3.1.1
add35bb 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Section2 for cis_3.1.1
1c487cb 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Section 2 - cis3.1.1
09148e9 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Section3 cis3.1.1
0f3363f 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
section4 cis3.1.1
761c02b 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
section_1 updates cis3.1.1
6d9aaaf 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
section2 update cis3.1.1
45fc34d 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
ansible-lint uppercase vars
a323d06 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
ansible lint upper vars
17ed1df 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
section5 cis3.1.1
4ab94ee 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
section6 cis3.1.1
19fc003 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed control numbering
f786174 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated layout
95d5b83 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed numbering
34ee16c 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed name layout
b5a93ec 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed new numbering
db90ccb 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed var case
541af25 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed mode on 5.3.3
f4abcb3 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed titles
72a2ad0 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
content no longer required
a0b5892 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
no longer required
2b72622 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
moved sections
3917981 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added new file
0e61d45 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added reboot option
37350a5 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed name layout
fe3c9bb 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated content for new control
7f3c360 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed macs
44a6bea 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed typo thanks shk3bq4d #243
2de63e2 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
aligned with audit cis3.1.1 controls
623edec 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated rules
1c586d0 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
uk-bolly and others added 27 commits July 20, 2021 09:38
@uk-bolly
Title updates
c997f1a 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
lint
adcd6fd 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
removed pkg check task - now when
7584dc7 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
title changes
b11e09f 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
title changes
2c8e7d5 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Title and config logging
093ded1 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
lint
17da780 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
lint
55de7d3 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed emerg
f3f797b 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
6.2.11 rewritten
73fc237 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added changed_when if issues found
b1b9816 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated changelog
74b8fbf 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated audit settings
1d59385 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated audit control names
7223c67 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Added timeout variable for audit
989aa85 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed merge conflict
865826b 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #252 from ansible-lockdown/cis_3.1.1
adee5aa 
Cis 3.1.1
@georgenalen
Added Issue/PR Templates
d2ec96a 
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
Merge pull request #253 from ansible-lockdown/issue_pr_tempaltes
722a057
@georgenalen
pr #250 updates
6e51b93 
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
pr #247 updates
c9022ef 
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
pr #248 updates
5c77b70 
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
Fix for bad space in rhel7cis_os_check var and missing quote on 5.4.2
f63ea3b 
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
Fixed typo when updating for PR 247
f9f52e2 
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
Merge pull request #255 from ansible-lockdown/pr_updates_sept2021
1024584 
Pr updates sept2021
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
updated templates locations
c06f046 
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
Merge pull request #256 from ansible-lockdown/template_fixes
aabe282 
updated templates locations
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
uk-bolly
uk-bolly approved these changes Sep 15, 2021
View reviewed changes
Copy link
Member

@uk-bolly uk-bolly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@georgenalen georgenalen merged commit 219b416 into main Sep 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@uk-bolly uk-bolly uk-bolly approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@georgenalen @uk-bolly