Remove the existing recursive line

ComplianceAsCode · Jul 24, 2024 · d7c3fdd · d7c3fdd
1 parent fc1b491
commit d7c3fdd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 0 deletions.
diff --git a/linux_os/guide/system/logging/journald/dir_groupowner_system_journal/bash/ubuntu.sh b/linux_os/guide/system/logging/journald/dir_groupowner_system_journal/bash/ubuntu.sh
@@ -1,6 +1,9 @@
 # platform = multi_platform_ubuntu
 
 TMPFILES_CONF="/etc/tmpfiles.d/00-systemd.conf"
+ORIGINAL_CONF="/usr/lib/tmpfiles.d/systemd.conf"
+
+sed -i --follow-symlinks -E '/[zZ][+]*\s+\/(var|run)\/log\/journal\s*/d' "$ORIGINAL_CONF"
 
 if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then
     sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+[^ $]\+\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2systemd-journal/" "$TMPFILES_CONF"

diff --git a/linux_os/guide/system/logging/journald/dir_owner_system_journal/bash/ubuntu.sh b/linux_os/guide/system/logging/journald/dir_owner_system_journal/bash/ubuntu.sh
@@ -1,6 +1,9 @@
 # platform = multi_platform_ubuntu
 
 TMPFILES_CONF="/etc/tmpfiles.d/00-systemd.conf"
+ORIGINAL_CONF="/usr/lib/tmpfiles.d/systemd.conf"
+
+sed -i --follow-symlinks -E '/[zZ][+]*\s+\/(var|run)\/log\/journal\s*/d' "$ORIGINAL_CONF"
 
 if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then
     sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2root/" "$TMPFILES_CONF"

diff --git a/linux_os/guide/system/logging/journald/dir_permissions_system_journal/bash/ubuntu.sh b/linux_os/guide/system/logging/journald/dir_permissions_system_journal/bash/ubuntu.sh
@@ -1,6 +1,9 @@
 # platform = multi_platform_ubuntu
 
 TMPFILES_CONF="/etc/tmpfiles.d/00-systemd.conf"
+ORIGINAL_CONF="/usr/lib/tmpfiles.d/systemd.conf"
+
+sed -i --follow-symlinks -E '/[zZ][+]*\s+\/(var|run)\/log\/journal\s*/d' "$ORIGINAL_CONF"
 
 if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then
     sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+\)\([^ $]*\)/Z\2~2750/" "$TMPFILES_CONF"

diff --git a/linux_os/guide/system/logging/journald/file_groupowner_system_journal/bash/ubuntu.sh b/linux_os/guide/system/logging/journald/file_groupowner_system_journal/bash/ubuntu.sh
@@ -1,6 +1,9 @@
 # platform = multi_platform_ubuntu
 
 TMPFILES_CONF="/etc/tmpfiles.d/00-systemd.conf"
+ORIGINAL_CONF="/usr/lib/tmpfiles.d/systemd.conf"
+
+sed -i --follow-symlinks -E '/[zZ][+]*\s+\/(var|run)\/log\/journal\s*/d' "$ORIGINAL_CONF"
 
 if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then
     sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+[^ $]\+\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2systemd-journal/" "$TMPFILES_CONF"

diff --git a/linux_os/guide/system/logging/journald/file_owner_system_journal/bash/ubuntu.sh b/linux_os/guide/system/logging/journald/file_owner_system_journal/bash/ubuntu.sh
@@ -1,6 +1,9 @@
 # platform = multi_platform_ubuntu
 
 TMPFILES_CONF="/etc/tmpfiles.d/00-systemd.conf"
+ORIGINAL_CONF="/usr/lib/tmpfiles.d/systemd.conf"
+
+sed -i --follow-symlinks -E '/[zZ][+]*\s+\/(var|run)\/log\/journal\s*/d' "$ORIGINAL_CONF"
 
 if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then
     sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+[^ $]\+\s\+\)\([^ $]\+\)/Z\2root/" "$TMPFILES_CONF"

diff --git a/linux_os/guide/system/logging/journald/file_permissions_system_journal/bash/ubuntu.sh b/linux_os/guide/system/logging/journald/file_permissions_system_journal/bash/ubuntu.sh
@@ -1,6 +1,9 @@
 # platform = multi_platform_ubuntu
 
 TMPFILES_CONF="/etc/tmpfiles.d/00-systemd.conf"
+ORIGINAL_CONF="/usr/lib/tmpfiles.d/systemd.conf"
+
+sed -i --follow-symlinks -E '/[zZ][+]*\s+\/var\/log\/journal\s*/d' "$ORIGINAL_CONF"
 
 if grep -qP "^.[+]*\s+\/var\/log\/journal\s+" "$TMPFILES_CONF"; then
     sed -i --follow-symlinks "s/\(^.[+]*\)\(\s\+\/var\/log\/journal\s\+\)\([^ $]*\)/Z\2~2750/" "$TMPFILES_CONF"