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

Initial main release of v1r13 #281

Merged
merged 218 commits into from
May 31, 2024
Merged

Initial main release of v1r13 #281

merged 218 commits into from
May 31, 2024

Conversation

uk-bolly
Copy link
Member

@uk-bolly uk-bolly commented May 24, 2024 •
edited
Loading

Overall Review of Changes:
Contains many updates from v1r12
A forced rebase due to legacy changes. PR #282 refers

Issue Fixes:
#242
#245
#248
#251
#254
#259
#260
#261
#262
#263
#266
#267
#268
#269
#272
#274
#279

Enhancements:
precommit updates and fixes

How has this been tested?:
Manually and pipelines

uk-bolly and others added 30 commits October 25, 2023 11:39
@uk-bolly
ruleid updates for v1r12 refer changelog
0945bc3 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated
7dbe85d 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated PRELIM in title
e7edfc1 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated the workflow version and galaxy setup
00c2ab8 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fix typo
805b774 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Oraclelinux updated thanks to @BillSkiCO
9ff31ad 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated task 20030 thanks to @BillSkiCO
141f134 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated 40321 thanks to @whitehat237
7acd113 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated after feedback from #245
574d4c1 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added issue #248 fix
52f0cae 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Added fix for #254
1d23663 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fix syntax
7879a03 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Squashed commit of the following:
ad7e0a2 
commit 14d7da6a3335dea85d73044cac45f851d45e721f
Author: Mark Bolwell <mark.bollyuk@gmail.com>
Date:   Wed Feb 21 15:52:45 2024 +0000

    updated

    Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

commit e6b8a7c2008da9cf11075265801723c597284d6e
Author: Mark Bolwell <mark.bollyuk@gmail.com>
Date:   Wed Feb 21 15:52:05 2024 +0000

    lint and variable improvements

    Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

commit 79948fb314df745bc37f94dffcdf6ec818d945bc
Author: Mark Bolwell <mark.bollyuk@gmail.com>
Date:   Wed Feb 21 15:51:32 2024 +0000

    ssh validation added

    Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

commit 4742d58286387ffdbf569c2094d34290c8f2f90a
Author: Mark Bolwell <mark.bollyuk@gmail.com>
Date:   Wed Feb 21 15:50:46 2024 +0000

    ssh validation added

    Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

commit 33348bc1d3a0537d0cdbcfc70c10286875d97261
Author: Mark Bolwell <mark.bollyuk@gmail.com>
Date:   Wed Feb 21 15:50:25 2024 +0000

    changed ordering and added logic

    Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

commit 6c2d07987d379575c6ecf766e528da19ba5ffae0
Author: Mark Bolwell <mark.bollyuk@gmail.com>
Date:   Wed Feb 21 15:50:12 2024 +0000

    removed as mnot required

    Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

commit 1d775c698c9270f707dddbd955d096bfaa978dae
Author: Mark Bolwell <mark.bollyuk@gmail.com>
Date:   Wed Feb 21 15:50:04 2024 +0000

    updated

    Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

commit 562d7604e5263ed4d5cd97cdd2a46ea4a1c3f58f
Author: Mark Bolwell <mark.bollyuk@gmail.com>
Date:   Wed Feb 21 15:49:57 2024 +0000

    updated precommit

    Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

commit bb46131304f00cfe9c9b7b62dda9150ab5d19643
Author: Mark Bolwell <mark.bollyuk@gmail.com>
Date:   Wed Feb 21 12:04:15 2024 +0000

    Added ability for audit_only

    Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fix typo line 020030
20661be 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated due to galaxy_ng changes
ccd1285 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@qwestduck @uk-bolly
Revert "fixed gnutls as per issue 196 thansk to @jmalpede"
756c791 
This reverts commit 63c4c84.

Signed-off-by: William Panlener <wpanlener@gmail.com>
@BillSkiCO @uk-bolly
Update main.yml
20fa953 
Removing stale var rhel8stig_sshd_compression

Signed-off-by: William Golembieski <william@armoryanalytics.com>
@pre-commit-ci @uk-bolly
[pre-commit.ci] pre-commit autoupdate
303c3d8 
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](pre-commit/pre-commit-hooks@v4.4.0...v4.5.0)
- [github.com/gitleaks/gitleaks: v8.18.0 → v8.18.1](gitleaks/gitleaks@v8.18.0...v8.18.1)
- [github.com/ansible-community/ansible-lint: v6.20.2 → v6.22.1](ansible/ansible-lint@v6.20.2...v6.22.1)
- [github.com/adrienverge/yamllint.git: v1.32.0 → v1.33.0](https://github.com/adrienverge/yamllint.git/compare/v1.32.0...v1.33.0)
@pre-commit-ci @uk-bolly
[pre-commit.ci] pre-commit autoupdate
180e9b0 
updates:
- [github.com/gitleaks/gitleaks: v8.18.1 → v8.18.2](gitleaks/gitleaks@v8.18.1...v8.18.2)
- [github.com/ansible-community/ansible-lint: v6.22.1 → v24.2.0](ansible/ansible-lint@v6.22.1...v24.2.0)
- [github.com/adrienverge/yamllint.git: v1.33.0 → v1.35.1](https://github.com/adrienverge/yamllint.git/compare/v1.33.0...v1.35.1)
@uk-bolly
updated Readme credits
9fb6548 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated credits
35eca32 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge branch 'devel' into stig_v1r12
3edbf29 
Signed-off-by: uk-bolly <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #259 from ansible-lockdown/stig_v1r12
1c4b7db 
Stig v1r12 release to devel
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate
97dd517 
updates:
- [github.com/ansible-community/ansible-lint: v24.2.0 → v24.2.1](ansible/ansible-lint@v24.2.0...v24.2.1)
@uk-bolly
Merge pull request #260 from ansible-lockdown/pre-commit-ci-update-co…
239fd40 
…nfig

[pre-commit.ci] pre-commit autoupdate
@Phenix66
Updated RHEL-08-020050 to loop over stdout_lines. Fixes issue #261.
5ee5bf2 
Signed-off-by: Phenix66 <34311559+Phenix66@users.noreply.github.com>
@uk-bolly
Merge pull request #262 from Phenix66/fix-issue-261
7c42617 
Updated RHEL-08-020050 to loop over stdout_lines. Fixes issue #261.
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate
384dd10 
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](pre-commit/pre-commit-hooks@v4.5.0...v4.6.0)
@uk-bolly
Merge pull request #264 from ansible-lockdown/pre-commit-ci-update-co…
0b8ea7f 
…nfig

[pre-commit.ci] pre-commit autoupdate
@uk-bolly
addressing #251
b6ecf05 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
pre-commit-ci bot and others added 28 commits May 24, 2024 15:15
@pre-commit-ci @uk-bolly
[pre-commit.ci] pre-commit autoupdate
b9e1fa1 
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](pre-commit/pre-commit-hooks@v4.5.0...v4.6.0)

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
addressing #251
2f81776 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fix issue #263
4d75944 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Address issues #242
050ac28 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
housekeeping lint
3c33a35 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
issue #267
ddaf901 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@fallenpixel @uk-bolly
Meet fix text of V-244546
1cf603c 
Signed-off-by: Eric Lehmann <katyl@katyl.info>
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@pre-commit-ci @uk-bolly
[pre-commit.ci] pre-commit autoupdate
81b5e67 
updates:
- [github.com/ansible-community/ansible-lint: v24.2.1 → v24.2.2](ansible/ansible-lint@v24.2.1...v24.2.2)

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
fixed error in conditional rhel-08-020022
d709014 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge in changes from v1r13 - Jan 24 (#274)
e86bb70 
* updated v1r13 reference

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* v1r13 updates

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* updated thanks to @Phenix66

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* updated thanks to @fallenpixel

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* tidy up quotes around mode

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* tidy up variables

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* updates to auditing order

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* #266 fix added

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* added prelim to includes

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* updated v1r13 reference

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* v1r13 updates

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* updated thanks to @Phenix66

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* tidy up quotes around mode

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* tidy up variables

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* updates to auditing order

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* added prelim to includes

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

* file mode updates with improved var usage

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

---------

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated conditional 040260
69908d1 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge branch 'devel' into updated_devel
55f8629 
Signed-off-by: uk-bolly <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #280 from ansible-lockdown/updated_devel
d50170b 
Updated of devel - DCO confirmation and signoff update
@uk-bolly
Merge branch 'main' into devel
e781879 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
040230 updated
5750a67 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated conditional sysctl improvements
7e76617 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated to 010070
88767b8 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added OS_ver variable
196898d 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added updated variable
f5651dd 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
added updated variable
efddae6 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
improved ansible facts variables
2a00e98 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
updated 10471 based on OS version
0e30a66 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
removed dupe line
95d876d 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
removed dupe lines
426bb02 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #282 from ansible-lockdown/v13_merge_fixes
2309c49 
V13 merge fixes
@uk-bolly
improved logic on 20104 and 10471
e47a1eb 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
lint update
cbf87b9 
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly
Merge pull request #283 from ansible-lockdown/may24_updates
18e1cdc 
May24 updates
georgenalen
georgenalen approved these changes May 30, 2024
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 9981f76 into main May 31, 2024
4 checks passed
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.
10 participants
@uk-bolly @georgenalen @qwestduck @BillSkiCO @Phenix66 @fallenpixel @JacobBuskirk @whitehat237 @MrSteve81 @PoundsOfFlesh