File ssg-fix-journald.patch of Package scap-security-guide.31761
Index: content-0.1.70/linux_os/guide/system/logging/journald/journald_compress/rule.yml
===================================================================
--- content-0.1.70.orig/linux_os/guide/system/logging/journald/journald_compress/rule.yml
+++ content-0.1.70/linux_os/guide/system/logging/journald/journald_compress/rule.yml
@@ -43,16 +43,6 @@ ocil: |-
<pre>
Compress=yes
</pre>
-{{%- if product == "sle15" %}}
-template:
- name: systemd_dropin_configuration
- vars:
- component: journald
- master_cfg_file: /etc/systemd/journald.conf
- dropin_dir: /etc/systemd/journal.d/
- param: Compress
- value: yes
-{{% else %}}
template:
name: shell_lineinfile
vars:
@@ -60,4 +50,3 @@ template:
parameter: Compress
value: yes
no_quotes: 'true'
-{{% endif -%}}
Index: content-0.1.70/linux_os/guide/system/logging/journald/journald_forward_to_syslog/rule.yml
===================================================================
--- content-0.1.70.orig/linux_os/guide/system/logging/journald/journald_forward_to_syslog/rule.yml
+++ content-0.1.70/linux_os/guide/system/logging/journald/journald_forward_to_syslog/rule.yml
@@ -44,16 +44,6 @@ ocil: |-
ForwardToSyslog=yes
</pre>
-{{%- if product == "sle15" %}}
-template:
- name: systemd_dropin_configuration
- vars:
- component: journald
- master_cfg_file: /etc/systemd/journald.conf
- dropin_dir: /etc/systemd/journal.d/
- param: ForwardToSyslog
- value: yes
-{{% else %}}
template:
name: shell_lineinfile
vars:
@@ -61,4 +51,3 @@ template:
parameter: ForwardToSyslog
value: yes
no_quotes: 'true'
-{{% endif -%}}
Index: content-0.1.70/linux_os/guide/system/logging/journald/journald_storage/rule.yml
===================================================================
--- content-0.1.70.orig/linux_os/guide/system/logging/journald/journald_storage/rule.yml
+++ content-0.1.70/linux_os/guide/system/logging/journald/journald_storage/rule.yml
@@ -43,16 +43,6 @@ ocil: |-
Storage=persistent
</pre>
-{{%- if product == "sle15" %}}
-template:
- name: systemd_dropin_configuration
- vars:
- component: journald
- master_cfg_file: /etc/systemd/journald.conf
- dropin_dir: /etc/systemd/journal.d/
- param: Storage
- value: persistent
-{{% else %}}
template:
name: shell_lineinfile
vars:
@@ -60,4 +50,3 @@ template:
parameter: Storage
value: persistent
no_quotes: 'true'
-{{% endif -%}}