dev-sec · rndmh3ro · Sep 6, 2022 · Sep 6, 2022 · Sep 6, 2022 · Sep 7, 2022
diff --git a/.github/workflows/mysql_hardening.yml b/.github/workflows/mysql_hardening.yml
@@ -26,7 +26,10 @@ jobs:
       matrix:
         molecule_distro:
           - centos7
+          - centosstream8
+          - centosstream9
           - rocky8
+          - rocky9
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204

diff --git a/.github/workflows/nginx_hardening.yml b/.github/workflows/nginx_hardening.yml
@@ -25,7 +25,10 @@ jobs:
       matrix:
         molecule_distro:
           - centos7
+          - centosstream8
+          - centosstream9
           - rocky8
+          - rocky9
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204

diff --git a/.github/workflows/os_hardening.yml b/.github/workflows/os_hardening.yml
@@ -25,7 +25,10 @@ jobs:
       matrix:
         molecule_distro:
           - centos7
+          - centosstream8
+          - centosstream9
           - rocky8
+          - rocky9
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204

diff --git a/.github/workflows/os_hardening_vm.yml b/.github/workflows/os_hardening_vm.yml
@@ -25,7 +25,10 @@ jobs:
       matrix:
         molecule_distro:
           - centos7
+          - centosstream8
+          - centosstream9
           - rocky8
+          - rocky9
           - ubuntu1804
           - ubuntu2004
           - ubuntu2204

diff --git a/.github/workflows/ssh_hardening.yml b/.github/workflows/ssh_hardening.yml
@@ -25,7 +25,10 @@ jobs:
       matrix:
         molecule_distro:
           - centos7
+          - centosstream8
+          - centosstream9
           - rocky8
+          - rocky9
           - fedora
           - ubuntu1804
           - ubuntu2004

diff --git a/.github/workflows/ssh_hardening_custom_tests.yml b/.github/workflows/ssh_hardening_custom_tests.yml
@@ -25,7 +25,10 @@ jobs:
       matrix:
         molecule_distro:
           - centos7
+          - centosstream8
+          - centosstream9
           - rocky8
+          - rocky9
           - fedora
           - ubuntu1804
           - ubuntu2004

diff --git a/molecule/ssh_hardening/verify.yml b/molecule/ssh_hardening/verify.yml
@@ -42,7 +42,7 @@
       shell: "bash /tmp/install.sh -s -- -P cinc-auditor -v 4"
 
     - name: Execute cinc-auditor tests
-      command: "/opt/cinc-auditor/bin/cinc-auditor exec --no-show-progress --no-color --no-distinct-exit https://github.com/dev-sec/ssh-baseline/archive/refs/heads/master.zip"
+      command: "/opt/cinc-auditor/bin/cinc-auditor exec --no-show-progress --no-color --no-distinct-exit https://github.com/dev-sec/ssh-baseline/archive/refs/heads/simplify_crypto.zip"
       register: test_results
       changed_when: false
       ignore_errors: true

diff --git a/roles/mysql_hardening/vars/RedHat_7.yml → roles/mysql_hardening/vars/RedHat.yml b/roles/mysql_hardening/vars/RedHat_7.yml → roles/mysql_hardening/vars/RedHat.yml
diff --git a/roles/mysql_hardening/vars/RedHat_8.yml b/roles/mysql_hardening/vars/RedHat_8.yml
diff --git a/roles/mysql_hardening/vars/Rocky_8.yml b/roles/mysql_hardening/vars/Rocky_8.yml
diff --git a/roles/mysql_hardening/vars/Ubuntu_16.yml → roles/mysql_hardening/vars/Ubuntu.yml b/roles/mysql_hardening/vars/Ubuntu_16.yml → roles/mysql_hardening/vars/Ubuntu.yml
diff --git a/roles/mysql_hardening/vars/Ubuntu_18.yml b/roles/mysql_hardening/vars/Ubuntu_18.yml
diff --git a/roles/mysql_hardening/vars/Ubuntu_20.yml b/roles/mysql_hardening/vars/Ubuntu_20.yml
diff --git a/roles/mysql_hardening/vars/Ubuntu_22.yml b/roles/mysql_hardening/vars/Ubuntu_22.yml
diff --git a/roles/os_hardening/vars/RedHat.yml b/roles/os_hardening/vars/RedHat.yml
@@ -33,7 +33,7 @@ os_auth_sub_gid_min: 100000
 os_auth_sub_gid_max: 600100000
 os_auth_sub_gid_count: 65536
 
-os_auth_pam_sssd_enable: false
+os_auth_pam_sssd_enable: true
 
 # defaults for useradd
 os_useradd_mail_dir: /var/spool/mail

diff --git a/roles/os_hardening/vars/RedHat_8.yml b/roles/os_hardening/vars/RedHat_8.yml
diff --git a/roles/os_hardening/vars/Rocky_8.yml b/roles/os_hardening/vars/Rocky_8.yml
diff --git a/roles/ssh_hardening/vars/CentOS_8.yml b/roles/ssh_hardening/vars/CentOS_8.yml
diff --git a/roles/ssh_hardening/vars/CentOS_9.yml b/roles/ssh_hardening/vars/CentOS_9.yml
diff --git a/roles/ssh_hardening/vars/RedHat.yml b/roles/ssh_hardening/vars/RedHat.yml
@@ -7,7 +7,7 @@ ssh_group: root
 ssh_host_keys_owner: 'root'
 ssh_host_keys_group: 'ssh_keys'
 ssh_selinux_packages:
-  - policycoreutils-python
+  - policycoreutils-python-utils
   - checkpolicy
 
 # true if SSH support Kerberos

diff --git a/roles/ssh_hardening/vars/RedHat_8.yml → roles/ssh_hardening/vars/RedHat_7.yml b/roles/ssh_hardening/vars/RedHat_8.yml → roles/ssh_hardening/vars/RedHat_7.yml
@@ -7,7 +7,7 @@ ssh_group: root
 ssh_host_keys_owner: 'root'
 ssh_host_keys_group: 'ssh_keys'
 ssh_selinux_packages:
-  - python3-policycoreutils
+  - policycoreutils-python
   - checkpolicy
 
 # true if SSH support Kerberos

diff --git a/roles/ssh_hardening/vars/Rocky_8.yml b/roles/ssh_hardening/vars/Rocky_8.yml