From 59e22e860035a9abf60858f677a47c09638489f9 Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Mon, 7 Feb 2022 16:44:41 +0000 Subject: [PATCH 1/3] fixed thanks to cf-sewe Signed-off-by: Mark Bolwell --- tasks/section_5/cis_5.4.x.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/section_5/cis_5.4.x.yml b/tasks/section_5/cis_5.4.x.yml index 681db73..05ccefb 100644 --- a/tasks/section_5/cis_5.4.x.yml +++ b/tasks/section_5/cis_5.4.x.yml @@ -24,7 +24,7 @@ dest: /etc/pam.d/system-auth state: present regexp: '^password requisite pam_pwquality.so' - line: "password requisite pam_pwquality.so try_first_pass local_users_only enforce-for-root retry=3 remember={{ rhel9cis_pam_faillock.remember }}" + line: "password requisite pam_pwquality.so try_first_pass local_users_only enforce_for_root retry=3 remember={{ rhel9cis_pam_faillock.remember }}" insertbefore: '^#?password ?' when: - rhel9cis_rule_5_4_1 or @@ -35,7 +35,7 @@ dest: /etc/pam.d/password-auth state: present regexp: '^password requisite pam_pwquality.so' - line: "password requisite pam_pwquality.so try_first_pass local_users_only enforce-for-root retry=3" + line: "password requisite pam_pwquality.so try_first_pass local_users_only enforce_for_root retry=3" insertbefore: '^#?password ?' when: rhel9cis_rule_5_4_1 From e6d129914e2e02e22052b7c8a36029bbaed264bd Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Mon, 7 Feb 2022 16:49:28 +0000 Subject: [PATCH 2/3] updated to use rocky image Signed-off-by: Mark Bolwell --- .github/workflows/communitytodevel.yml | 2 +- .github/workflows/develtomain.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/communitytodevel.yml b/.github/workflows/communitytodevel.yml index 9ad4d78..abd5594 100644 --- a/.github/workflows/communitytodevel.yml +++ b/.github/workflows/communitytodevel.yml @@ -34,6 +34,6 @@ jobs: # Job ID job_id: 5f933cbcf9c74e86b1609c00 # Variables - variables: '{ "gitrepo": "https://github.com/ansible-lockdown/RHEL9-CIS.git", "image": "ami-04483b15b4268d18d", "githubBranch": "${{ github.head_ref }}", "username": "centos" }' + variables: '{ "gitrepo": "https://github.com/ansible-lockdown/RHEL8-CIS.git", "image": "ami-0335e1660e1197d63", "githubBranch": "${{ github.head_ref }}", "username": "rocky" }' # Refactr API base URL api_url: # optional diff --git a/.github/workflows/develtomain.yml b/.github/workflows/develtomain.yml index 11781c6..b5534ed 100644 --- a/.github/workflows/develtomain.yml +++ b/.github/workflows/develtomain.yml @@ -35,6 +35,6 @@ jobs: # Job ID job_id: 5f90ad90f9c74e6d1e606e33 # Variables - variables: '{ "gitrepo": "https://github.com/ansible-lockdown/RHEL9-CIS.git", "image": "ami-04483b15b4268d18d", "username": "centos" }' + variables: '{ "gitrepo": "https://github.com/ansible-lockdown/RHEL8-CIS.git", "image": "ami-0335e1660e1197d63", "username": "rocky" }' # Refactr API base URL api_url: # optional From c333a085b5ac376a250a19321f44561204fbff99 Mon Sep 17 00:00:00 2001 From: George Nalen Date: Mon, 7 Feb 2022 13:43:56 -0500 Subject: [PATCH 3/3] updated gitrepo path in workflows Signed-off-by: George Nalen --- .github/workflows/communitytodevel.yml | 2 +- .github/workflows/develtomain.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/communitytodevel.yml b/.github/workflows/communitytodevel.yml index abd5594..ed9f0c7 100644 --- a/.github/workflows/communitytodevel.yml +++ b/.github/workflows/communitytodevel.yml @@ -34,6 +34,6 @@ jobs: # Job ID job_id: 5f933cbcf9c74e86b1609c00 # Variables - variables: '{ "gitrepo": "https://github.com/ansible-lockdown/RHEL8-CIS.git", "image": "ami-0335e1660e1197d63", "githubBranch": "${{ github.head_ref }}", "username": "rocky" }' + variables: '{ "gitrepo": "https://github.com/ansible-lockdown/RHEL9-CIS.git", "image": "ami-0335e1660e1197d63", "githubBranch": "${{ github.head_ref }}", "username": "rocky" }' # Refactr API base URL api_url: # optional diff --git a/.github/workflows/develtomain.yml b/.github/workflows/develtomain.yml index b5534ed..467bc3e 100644 --- a/.github/workflows/develtomain.yml +++ b/.github/workflows/develtomain.yml @@ -35,6 +35,6 @@ jobs: # Job ID job_id: 5f90ad90f9c74e6d1e606e33 # Variables - variables: '{ "gitrepo": "https://github.com/ansible-lockdown/RHEL8-CIS.git", "image": "ami-0335e1660e1197d63", "username": "rocky" }' + variables: '{ "gitrepo": "https://github.com/ansible-lockdown/RHEL9-CIS.git", "image": "ami-0335e1660e1197d63", "username": "rocky" }' # Refactr API base URL api_url: # optional