From 4e8397b89ed5cb3284caf0194560880e2ceeadb5 Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Thu, 19 Jan 2023 13:12:33 +0000 Subject: [PATCH] fqcn updates Signed-off-by: Mark Bolwell --- tasks/section_1/cis_1.1.1.x.yml | 8 ++++---- tasks/section_1/cis_1.1.7.x.yml | 3 --- tasks/section_1/cis_1.1.x.yml | 2 +- tasks/section_1/cis_1.8.x.yml | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tasks/section_1/cis_1.1.1.x.yml b/tasks/section_1/cis_1.1.1.x.yml index 00303ac..7a88f6f 100644 --- a/tasks/section_1/cis_1.1.1.x.yml +++ b/tasks/section_1/cis_1.1.1.x.yml @@ -11,7 +11,7 @@ mode: 0600 - name: "1.1.1.1 | PATCH | Ensure mounting of squashfs filesystems is disabled | blacklist" - lineinfile: + ansible.builtin.lineinfile: path: /etc/modprobe.d/blacklist.conf regexp: "^(#)?blacklist squashfs(\\s|$)" line: "blacklist squashfs" @@ -19,7 +19,7 @@ mode: 0600 - name: "1.1.1.1 | PATCH | Ensure mounting of squashfs filesystems is disabled | Disable squashfs" - modprobe: + community.general.modprobe: name: squashfs state: absent when: not system_is_container @@ -44,7 +44,7 @@ mode: 0600 - name: "1.1.1.2 | PATCH | Ensure mounting of udf filesystems is disabled | blacklist" - lineinfile: + ansible.builtin.lineinfile: path: /etc/modprobe.d/blacklist.conf regexp: "^(#)?blacklist udf(\\s|$)" line: "blacklist udf" @@ -52,7 +52,7 @@ mode: 0600 - name: "1.1.1.2 | PATCH | Ensure mounting of udf filesystems is disable | Disable udf" - modprobe: + community.general.modprobe: name: udf state: absent when: not system_is_container diff --git a/tasks/section_1/cis_1.1.7.x.yml b/tasks/section_1/cis_1.1.7.x.yml index 9fadf59..54da358 100644 --- a/tasks/section_1/cis_1.1.7.x.yml +++ b/tasks/section_1/cis_1.1.7.x.yml @@ -1,8 +1,5 @@ --- -- ansible.builtin.debug: - msg: "{{ mount_names }}" - - name: "1.1.7.1 | AUDIT | Ensure separate partition exists for /home" block: - name: "1.1.7.1 | AUDIT | Ensure separate partition exists for /home | Absent" diff --git a/tasks/section_1/cis_1.1.x.yml b/tasks/section_1/cis_1.1.x.yml index 19c99c0..0496300 100644 --- a/tasks/section_1/cis_1.1.x.yml +++ b/tasks/section_1/cis_1.1.x.yml @@ -18,7 +18,7 @@ state: absent - name: "1.1.9 | PATCH | Disable USB Storage | blacklist" - lineinfile: + ansible.builtin.lineinfile: path: /etc/modprobe.d/blacklist.conf regexp: "^(#)?blacklist usb-storage(\\s|$)" line: "blacklist usb-storage" diff --git a/tasks/section_1/cis_1.8.x.yml b/tasks/section_1/cis_1.8.x.yml index f627f6a..97a5031 100644 --- a/tasks/section_1/cis_1.8.x.yml +++ b/tasks/section_1/cis_1.8.x.yml @@ -70,7 +70,7 @@ - rule_1.8.3 - name: "1.8.4 | PATCH | Ensure GDM screen locks when the user is idle" - copy: + ansible.builtin.copy: dest: /etc/dconf/db/local.d/00-screensaver content: | [org/gnome/desktop/session] @@ -90,7 +90,7 @@ - rule_1.8.4 - name: "1.8.5 PATCH | Ensure GDM screen locks cannot be overridden" - lineinfile: + ansible.builtin.lineinfile: path: /etc/dconf/db/local.d/locks/session create: true line: /org/gnome/desktop/screensaver/lock-delay