Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ensure_logrotate_activated: Check timers.target.wants as well #12683

Merged
merged 1 commit into from
Dec 9, 2024
Merged

ensure_logrotate_activated: Check timers.target.wants as well #12683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions linux_os/guide/system/logging/log_rotation/ensure_logrotate_activated/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<criteria comment="Check if either logrotate timer or cron job is enabled" operator="OR">
<criterion comment="Check if /etc/cron.daily/logrotate file exists (and calls logrotate)" test_ref="test_cron_daily_logrotate_existence" />
{{% if product in ["rhcos4", "rhel9", "rhel10", "sle12", "sle15", "ol9"] %}}
<criterion comment="Check if logrotate timer is enabled" test_ref="test_logrotate_enabled_multi_user_target" />
<criterion comment="Check if logrotate timer is enabled" test_ref="test_logrotate_enabled_systemd_target" />
{{% endif %}}
</criteria>
</criteria>
Expand Down Expand Up @@ -56,14 +56,14 @@

{{% if product in ["rhcos4", "rhel9", "rhel10", "sle12", "sle15", "ol9"] %}}
<unix:file_test check="all" check_existence="all_exist"
comment="look for logrotate.timer in /etc/systemd/system/multi-user.target.wants"
id="test_logrotate_enabled_multi_user_target" version="1">
<unix:object object_ref="object_logrotate_enabled_multi_user_target" />
comment="look for logrotate.timer in multi-user.target.wants and timers.target.wants"
id="test_logrotate_enabled_systemd_target" version="1">
<unix:object object_ref="object_logrotate_enabled_systemd_target" />
</unix:file_test>

<unix:file_object comment="look for logrotate.timer in /etc/systemd/system/multi-user.target.wants"
id="object_logrotate_enabled_multi_user_target" version="1">
<unix:filepath>/etc/systemd/system/multi-user.target.wants/logrotate.timer</unix:filepath>
<unix:file_object comment="look for logrotate.timer in /etc/systemd/system/multi-user.target.wants and /etc/systemd/system/timers.target.wants"
id="object_logrotate_enabled_systemd_target" version="1">
<unix:filepath operation="pattern match">^/etc/systemd/system/(multi-user|timers)\.target\.wants/logrotate\.timer$</unix:filepath>
<filter action="include">unit_logrotate_state_symlink</filter>
</unix:file_object>

Expand Down
Loading