Update rsyslog_cron_logging for bootable containers #12575
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remediation of the rule `rsyslog_cron_logging` calls `systemctl reload` which doesn't work in the bootable container build environment and so we use the `bash_not_bootc_build` macro to not run it there.
|
Start a new ephemeral environment with changes proposed in this pull request: rhel8 (from CTF) Environment (using Fedora as testing environment) Fedora Testing Environment Oracle Linux 8 Environment |
|
This datastream diff is auto generated by the check Click here to see the full diffbash remediation for rule 'xccdf_org.ssgproject.content_rule_rsyslog_cron_logging' differs.
--- xccdf_org.ssgproject.content_rule_rsyslog_cron_logging
+++ xccdf_org.ssgproject.content_rule_rsyslog_cron_logging
@@ -6,7 +6,9 @@
echo "cron.* /var/log/cron" >> /etc/rsyslog.d/cron.conf
fi
-systemctl restart rsyslog.service
+if [[ "$OSCAP_BOOTC_BUILD" != "YES" ]] ; then
+ systemctl restart rsyslog.service
+fi
else
>&2 echo 'Remediation is not applicable, nothing was done' |
|
Code Climate has analyzed commit 9c310a3 and detected 0 issues on this pull request. The test coverage on the diff in this pull request is 100.0% (50% is the threshold). This pull request will bring the total coverage in the repository to 60.9% (0.0% change). View more on Code Climate. |
jan-cerny
approved these changes
Nov 6, 2024
jan-cerny
approved these changes
Nov 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remediation of the rule
rsyslog_cron_loggingcallssystemctl reloadwhich doesn't work in the bootable container build environment and so we use thebash_not_bootc_buildmacro to not run it there.