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 v2.0.0 #255

Merged
merged 144 commits into from
Jan 7, 2025
Merged

Benchmark v2.0.0 #255

merged 144 commits into from
Jan 7, 2025

Conversation

uk-bolly
Copy link
Member

@uk-bolly uk-bolly commented Nov 26, 2024 •
edited
Loading

Overall Review of Changes:
Update to CIS version 2.0.0 for ubuntu22

Do not migrate

CIS have rewritten with a full release including but not limited to

  • reordering
  • new sections and controls in differing sections

This is a rewrite off approx 75% of controls

  • New variables
  • Improved audit related checks
  • Greater options on some controls
  • Updated lint
  • Updated layout
  • Many rule and control improvements
  • mountpoint task updates

How has this been tested?:
Manually, pipeline and subscription users

uk-bolly added 30 commits June 27, 2024 17:43
@uk-bolly
initial v2.0 update
7ff3857 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
updated 5.4.3.2 variables
d8f3311 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
fix confditionals if skipped
ed5b7cc 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
updated conditionals
72a47e7 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
updated ID references
d39d92e 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
fix typo
58a76a1 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
updated
4061505 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
adjusted rule ids
f7fd57d 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
1.1.1.6 updated conditionals
327ba53 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
fixed typo
e4db7a6 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
updated var naming
83123bf 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
fix layout
c887a75 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
reomved comments
f302e52 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
5.3.3.4.4 fixed path
e1d43b6 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
moved directory creation to prelim
48df824 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
removed path as not valid for OS
0b123a4 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
fix layout and conditionals
1604af6 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
layout and naming updates
dcf74dc 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
tidy up and remove uneccessary items
d3caf0f 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
handler naming correction
ee4cec7 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
updated handler naming
e89587f 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
renamed files
9b62df3 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
fix tasks
78d17cc 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
fix typo
c4dbd7c 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
rename handler
8a03ed8 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
rename var
cddb639 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
moved tasks and updated
0d0e2d0 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
update var
c0e6da2 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
aligned variables
fe594fd 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
tidy up 6.4.3.1-4
a56603f 
Signed-off-by: Mark Bolwell <[email protected]>
uk-bolly added 20 commits December 4, 2024 12:29
@uk-bolly
addressed #260 thanks to @kbknapp
34dd800 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
addressed #261 thanks to kbknapp
57ca826 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
fix typo in variable
d28adb5 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
Addressed #262 mount refactor thanks to @bgro
6632b77 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
Updated tmpfs options in conditional
b1068de 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
Updated with name titles
f712114 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
Enable debug options for mounts
180d19a 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
expanded mountpoint explaination
db17068 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
layout update for pipeline
6e6161c 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
convert file characterset
7056dd0 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
removed locale
a9cb027 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
Align mountpoint variable naming
0666e00 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
change case in title
7f93438 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
Merge pull request #263 from ansible-lockdown/mounts
31844a6 
Mounts
@uk-bolly
updated 5.4.2.5 title to patch
c175e7a 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
updated title 6.1.1 to audit
43ebf53 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
6.3.2.1 moved to path from dest in module
3d93309 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
renamed register to isolate for task
e39ab01 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
Updated location for notify entry
cc3398f 
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly
Merge pull request #266 from ansible-lockdown/tweaks
d162c7a 
Title and lint updates
@GiJ03
Copy link

GiJ03 commented Jan 3, 2025

By when we can have Benchmark v2.0.0 release?

@GiJ03
Copy link

GiJ03 commented Jan 6, 2025

Any updates on this, please?
#255 (comment)

georgenalen
georgenalen approved these changes Jan 6, 2025
View reviewed changes
Copy link
Contributor

@georgenalen georgenalen 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!

@uk-bolly uk-bolly merged commit 0f7e901 into devel Jan 7, 2025
4 checks passed
@uk-bolly uk-bolly deleted the benchmark_v2.0.0 branch January 7, 2025 06:57
@uk-bolly
Copy link
Member Author

uk-bolly commented Jan 7, 2025

Any updates on this, please? #255 (comment)

hi @GiJ03,
This has not been a small release it is almost a rewrite of the previous version due to the changes from CIS. This has now been released to devel.
This will be moved to main normally in about 2 weeks to the main branch dependent on feedback.

Thanks

uk-bolly

@GiJ03
Copy link

GiJ03 commented Jan 7, 2025

Thanks @uk-bolly for the confirmation. Looking forward to it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@georgenalen georgenalen georgenalen 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.
3 participants
@uk-bolly @GiJ03 @georgenalen