Merge pull request #12181 from Mab879/fix_12171

Create file if it doesn't exist for coredump rules
ComplianceAsCode · Jul 29, 2024 · 15ebc8b · 15ebc8b
2 parents 2ff314f + 7b774a1
commit 15ebc8b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/...ictions/coredumps/coredump_disable_backtraces/tests/etc_systemd_coredump_conf_dne.fail.sh b/...ictions/coredumps/coredump_disable_backtraces/tests/etc_systemd_coredump_conf_dne.fail.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+FILE="/etc/systemd/coredump.conf"
+if [ -f $FILE ]; then
+    rm $FILE
+fi
+
diff --git a/...strictions/coredumps/coredump_disable_storage/tests/etc_systemd_coredump_conf_dne.fail.sh b/...strictions/coredumps/coredump_disable_storage/tests/etc_systemd_coredump_conf_dne.fail.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+FILE="/etc/systemd/coredump.conf"
+if [ -f $FILE ]; then
+    rm $FILE
+fi
+
diff --git a/shared/macros/10-ansible.jinja b/shared/macros/10-ansible.jinja
@@ -293,17 +293,11 @@ value: :code:`Setting={{ varname1 }}`
 #}}
 {{%- macro ansible_coredump_config_set(msg='', parameter='', value='') %}}
 {{% if 'sle' in product %}}
-
-- name: "{{{ rule_title }}}: Make sure Coredump section exist in remediation file"
-  ansible.builtin.lineinfile:
-    path: '/etc/systemd/coredump.conf.d/oscap-autoremedy.conf'
-    line: '[Coredump]'
-    create: true
-
-{{{ ansible_set_config_file(msg, "/etc/systemd/coredump.conf.d/oscap-autoremedy.conf", parameter=parameter, value=value, create="yes", separator="=", separator_regex="\s*=\s*", insert_after="[Coredump]") }}}
+{{% set file = '/etc/systemd/coredump.conf.d/oscap-autoremedy.conf' %}}
 {{% else %}}
-{{{ ansible_set_config_file(msg, "/etc/systemd/coredump.conf", parameter=parameter, value=value, create="no", separator="=", separator_regex="\s*=\s*") }}}
+{{% set file = '/etc/systemd/coredump.conf' %}}
 {{% endif %}}
+{{{ ansible_ini_file_set(file, "Coredump", parameter, value) }}}
 {{%- endmacro %}}
 
 

diff --git a/shared/macros/10-bash.jinja b/shared/macros/10-bash.jinja
@@ -299,18 +299,7 @@ fi
 {{% else %}}
 {{%- set target_path="/etc/systemd/coredump.conf" -%}}
 {{% endif %}}
-{{{ set_config_file(
-        path=target_path,
-        parameter=parameter,
-        value=value,
-        create=true,
-        insert_after="",
-        insert_before="",
-        insensitive=true,
-        separator="=",
-        separator_regex="\s*=\s*",
-        prefix_regex="^\s*")
-    }}}
+{{{ bash_ensure_ini_config(target_path, section="Coredump", key=parameter, value=value) }}}
 {{%- endmacro -%}}