diff --git a/.github/workflows/os_hardening_vm.yml b/.github/workflows/os_hardening_vm.yml index 55742535..05cc987b 100644 --- a/.github/workflows/os_hardening_vm.yml +++ b/.github/workflows/os_hardening_vm.yml @@ -23,11 +23,11 @@ jobs: matrix: molecule_distro: - centos7 - - rocky8 - - ubuntu1804 - - ubuntu2004 - - debian9 - - debian10 + ##- rocky8 + ##- ubuntu1804 + ##- ubuntu2004 + ##- debian9 + ##- debian10 # - opensuse42 # opensuse currently cannot get an ip address # - arch - arch is currently not supported by cinc-auditor steps: diff --git a/roles/os_hardening/tasks/sysctl.yml b/roles/os_hardening/tasks/sysctl.yml index b0d673a2..14dc67d9 100644 --- a/roles/os_hardening/tasks/sysctl.yml +++ b/roles/os_hardening/tasks/sysctl.yml @@ -48,6 +48,11 @@ sysctl_config: '{{ sysctl_config | combine(sysctl_custom_config) }}' when: sysctl_custom_config | default() + - name: Remove entries sysctl-dict if os does not support these + set_fact: + sysctl_config: '{{ sysctl_config | combine(sysctl_unsupported_entries) }}' + when: sysctl_unsupported_entries | default() + # sysctl_rhel_config is kept for backwards-compatibility. use sysctl_custom_config instead - name: Create a combined sysctl-dict if os-dependent sysctls are defined set_fact: diff --git a/roles/os_hardening/vars/RedHat_7.yml b/roles/os_hardening/vars/RedHat_7.yml index c3308850..530c4564 100644 --- a/roles/os_hardening/vars/RedHat_7.yml +++ b/roles/os_hardening/vars/RedHat_7.yml @@ -43,3 +43,7 @@ modprobe_package: 'module-init-tools' auditd_package: 'audit' hidepid_option: '0' # allowed values: 0, 1, 2 + +sysctl_unsupported_entries: + - 'fs.protected_fifos' + - 'fs.protected_regular'