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.

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

V13 merge fixes #282

Merged
merged 23 commits into from
May 30, 2024
Merged

V13 merge fixes #282

merged 23 commits into from
May 30, 2024

Conversation

uk-bolly
Copy link
Member

Overall Review of Changes:
Issues with historical keys and mere conflicts resolved
Updated from main and merge to devel
rebased to ensure sign off exists

How has this been tested?:
Pipeline

georgenalen and others added 21 commits November 5, 2020 16:54
Change master to main in actions
RHEL8 STIG Version 1 Release 1
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
Minor Fixes
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
Devel to main
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
Benchmark Version 1 Rev. 2 and other fixes
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
Added Issue and PR templates and an issue fix
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
Benchmark 1.3 updates and issue fixes
Signed-off-by: George Nalen <georgen@mindpointgroup.com>
Benchmark 1.7 and issue fixes
Main updates to Benchmark v1r8 release
Devel to main release stig v1r9
Release to main for bug fixes and improvements
v1r11 updates release to main
devel - main - workflow and discord
* ruleid updates for v1r12 refer changelog

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

* updated

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

* updated PRELIM in title

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

* updated the workflow version and galaxy setup

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

* fix typo

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

* Oraclelinux updated thanks to @BillSkiCO

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

* updated task 20030 thanks to @BillSkiCO

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

* updated 40321 thanks to @whitehat237

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

* updated after feedback from #245

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

* added issue #248 fix

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

* Added fix for #254

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

* fix syntax

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

* Squashed commit of the following:

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>

* fix typo line 020030

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

* updated due to galaxy_ng changes

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

* Revert "fixed gnutls as per issue 196 thansk to @jmalpede"

This reverts commit 63c4c84.

Signed-off-by: William Panlener <wpanlener@gmail.com>

* Update main.yml

Removing stale var rhel8stig_sshd_compression

Signed-off-by: William Golembieski <william@armoryanalytics.com>

* [pre-commit.ci] pre-commit autoupdate

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] pre-commit autoupdate

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)

* updated Readme credits

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

* updated credits

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

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/ansible-community/ansible-lint: v24.2.0 → v24.2.1](ansible/ansible-lint@v24.2.0...v24.2.1)

* Updated RHEL-08-020050 to loop over stdout_lines. Fixes issue #261.

Signed-off-by: Phenix66 <34311559+Phenix66@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate

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)

* addressing #251

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

* fix issue #263

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

* Address issues #242

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

* housekeeping lint

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

* Meet fix text of V-244546

Signed-off-by: Eric Lehmann <katyl@katyl.info>

* issue #267

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

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/ansible-community/ansible-lint: v24.2.1 → v24.2.2](ansible/ansible-lint@v24.2.1...v24.2.2)

* fixed error in conditional rhel-08-020022

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

---------

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
Signed-off-by: William Panlener <wpanlener@gmail.com>
Signed-off-by: William Golembieski <william@armoryanalytics.com>
Signed-off-by: uk-bolly <mark.bollyuk@gmail.com>
Signed-off-by: Phenix66 <34311559+Phenix66@users.noreply.github.com>
Signed-off-by: Eric Lehmann <katyl@katyl.info>
Co-authored-by: William Panlener <wpanlener@gmail.com>
Co-authored-by: William Golembieski <william@armoryanalytics.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Phenix66 <34311559+Phenix66@users.noreply.github.com>
Co-authored-by: Eric Lehmann <katyl@katyl.info>
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
@uk-bolly uk-bolly requested a review from georgenalen May 28, 2024 15:29
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
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 2309c49 into devel May 30, 2024
4 checks passed
@uk-bolly uk-bolly deleted the v13_merge_fixes branch May 30, 2024 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants