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

Devel to main for release #246

Merged
merged 78 commits into from
Jul 12, 2021
Merged

Devel to main for release #246

merged 78 commits into from
Jul 12, 2021

Conversation

uk-bolly
Copy link
Member

Update main with latest PR's prior to new benchmark release

mark.bollyuk@gmail.com

uk-bolly and others added 30 commits April 26, 2021 08:32
@uk-bolly
issue #213 now in block
88272dc 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
layout
17ddec7 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@georgenalen
Merge pull request #214 from ansible-lockdown/issue_#213
8e27530 
Issue #213
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@uk-bolly
added fixes for issues #215
22d6e15 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
issue 217 - 4.2.1.4 idempotence improvement
58d91ad 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
moved 1.2.1 to block and lint
8ba3552 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@georgenalen
Merge pull request #218 from ansible-lockdown/issue_215
acd0526 
added fixes for issues #215
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
Merge pull request #220 from ansible-lockdown/issue_217
36afd5a 
issue 217 - 4.2.1.4 idempotence improvement
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@uk-bolly
Idempotence & whitelist enhancement
f1022e5 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated latest and layout
94e9444 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added fixeds for #221
048ecca 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
remove debug - update whitelist
a557df0 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@georgenalen
Merge pull request #223 from ansible-lockdown/issue_222
9a81b72 
Issue 222 and improvements
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@uk-bolly
3.5.1.7 & 6.2.5 typo fixes
fe62c2e 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@georgenalen
Merge pull request #228 from ansible-lockdown/fixes_#224_#227
ce82acf 
3.5.1.7 & 6.2.5  typo fixes
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@uk-bolly
Added aide type default & bootloader file
408b73f 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #229 from ansible-lockdown/audit_template_update
7adb1fd 
updated lockdown audit tool template
@uk-bolly
added lint file
6d72cbb 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Updated Metafile
81ce9ef 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
meta update
fa208dc 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added yaml lint
ded0ad4 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
lint and tidy up
6a373de 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Added .cache to ignore
04f25b7 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
permissions uniform across playbook
77236ec 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated yamllint
eccb57a 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
tidy up for ansible_lint
cab7459 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated yamllint
61d94aa 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
section_1 lint
af51f86 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
section_2 lint
1d473ee 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
section_3 lint
ad59a81 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
tuxpeople and others added 27 commits June 3, 2021 13:22
@tuxpeople
added missing ipv6 rules
9cd0ae5 
Signed-off-by: Thomas Deutsch <thomas@tuxpeople.org>
@georgenalen
Merge pull request #235 from ihotz/patch-ipv6-rules
cfd7ae5 
added missing ipv6 rules
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
linting updates
51bf12b 
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
fixed 6.2.5 spacing
3612c57 
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@georgenalen
Merge pull request #236 from ansible-lockdown/pr_233_staging
aa340cc 
Added missing IPv6 rules
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
@uk-bolly
added sugroup variable and defaults
bd2ab28 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Added sugroup to goss template
484fc7e 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Added assertion to check sugroup exists
8fbf697 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
rhel7cis_sugroup with default for goss check
92187a5 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #237 from ansible-lockdown/sugroup_options
4c9bb3a 
added sugroup variable and defaults
@uk-bolly
Added extra grep in command issue #225
1425ade 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Added variables for LE Audit
12047ee 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated cis benchmark version
34bd05b 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed missing braces
597a263 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated goss.py with format options
1607554 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #238 from ansible-lockdown/login_banners_#225
684685d 
Login banners #225
LE audit updates
@uk-bolly
default audit type json
0ad7a84 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
issues on some testing reverted to original file
1625cb1 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #239 from ansible-lockdown/Audit_alignment
30343ae 
Audit alignment
@uk-bolly
updated comment and docs for audit controls
9523f90 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Issue #240 gshadow- permissions
dcd18f1 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Issue #241 quotes on .rc removed
b3642cc 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed var name for audit summary
c952d72 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #242 from ansible-lockdown/issue_and_audit_updates
6a4f71b 
Issue and audit updates
@uk-bolly
fixed typo thanks shk3bq4d #243
654b168 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
change value thanks to ikeusmaximus #245
7eed0a7 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #244 from ansible-lockdown/issue_#243
0346181 
fixed typo
georgenalen
georgenalen approved these changes Jul 12, 2021
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

@georgenalen georgenalen merged commit ed38bf4 into main Jul 12, 2021
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.

None yet
4 participants
@uk-bolly @shk3bq4d @georgenalen @tuxpeople