Skip to content

SLE16 fix ensure_logrotate_activated to work with /etc configuration #14680

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

Open
teacup-on-rockingchair wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SLE16 fix ensure_logrotate_activated to work with /etc configuration #14680

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions linux_os/guide/system/logging/log_rotation/ensure_logrotate_activated/ansible/shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
# complexity = low
# disruption = low

{{% if product == 'sle16' %}}
{{% set LOGROTATE_CONF_FILE="/usr/etc/logrotate.conf" %}}
{{% else %}}
{{% set LOGROTATE_CONF_FILE="/etc/logrotate.conf" %}}
{{% if product in [ 'sle16', 'slmicro6' ] %}}
{{{ ansible_copy_distro_defaults('/usr/etc/logrotate.conf', LOGROTATE_CONF_FILE, rule_title) }}}
{{% endif %}}

- name: "Configure daily log rotation in {{{ LOGROTATE_CONF_FILE }}}"
Expand Down
7 changes: 4 additions & 3 deletions linux_os/guide/system/logging/log_rotation/ensure_logrotate_activated/bash/shared.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# platform = multi_platform_all

{{% if product == 'sle16' %}}
LOGROTATE_CONF_FILE='/usr/etc/logrotate.conf'
{{% else %}}
LOGROTATE_CONF_FILE='/etc/logrotate.conf'

{{% if product in [ 'sle16', 'slmicro6' ] %}}
{{{ bash_copy_distro_defaults('/usr/etc/logrotate.conf', "${LOGROTATE_CONF_FILE}") }}}
{{% endif %}}

{{% if 'sle' in product or product == 'slmicro5' %}}
SYSTEMCTL_EXEC='/usr/bin/systemctl'
{{% else %}}
Expand Down
8 changes: 0 additions & 8 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 @@ -25,11 +25,7 @@
</ind:textfilecontent54_test>

<ind:textfilecontent54_object id="object_logrotate_conf_daily_setting" version="2">
{{% if product == 'sle16' %}}
<ind:filepath>/usr/etc/logrotate.conf</ind:filepath>
{{% else %}}
<ind:filepath>/etc/logrotate.conf</ind:filepath>
{{% endif %}}
<ind:pattern operation="pattern match">^\s*daily[\s#]*$</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
Expand All @@ -41,11 +37,7 @@
</ind:textfilecontent54_test>

<ind:textfilecontent54_object id="object_logrotate_conf_no_other_keyword" version="2">
{{% if product == 'sle16' %}}
<ind:filepath>/usr/etc/logrotate.conf</ind:filepath>
{{% else %}}
<ind:filepath>/etc/logrotate.conf</ind:filepath>
{{% endif %}}
<ind:pattern operation="pattern match">^\s*(weekly|monthly|yearly)[\s#]*$</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
Expand Down
8 changes: 6 additions & 2 deletions ...ogging/log_rotation/ensure_logrotate_activated/tests/logrotate_conf_extra_monthly.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#!/bin/bash

# packages = logrotate,crontabs
LOGROTATE_CONF_FILE="/etc/logrotate.conf"
{{% if product in [ 'sle16', 'slmicro6' ] %}}
{{{ bash_copy_distro_defaults('/usr/etc/logrotate.conf', "${LOGROTATE_CONF_FILE}") }}}
{{% endif %}}

sed -i "s/weekly/daily/g" /etc/logrotate.conf
echo "monthly" >> /etc/logrotate.conf
sed -i "s/weekly/daily/g" "${LOGROTATE_CONF_FILE}"
echo "monthly" >> "${LOGROTATE_CONF_FILE}"
5 changes: 2 additions & 3 deletions ...ystem/logging/log_rotation/ensure_logrotate_activated/tests/logrotate_conf_weekly.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#!/bin/bash

{{% if product == 'sle16' %}}
LOGROTATE_CONF_FILE="/usr/etc/logrotate.conf"
{{% else %}}
LOGROTATE_CONF_FILE="/etc/logrotate.conf"
{{% if product in [ 'sle16', 'slmicro6' ] %}}
{{{ bash_copy_distro_defaults('/usr/etc/logrotate.conf', "${LOGROTATE_CONF_FILE}") }}}
{{% endif %}}
sed -i "s/daily/weekly/" "${LOGROTATE_CONF_FILE}"
5 changes: 4 additions & 1 deletion ...system/logging/log_rotation/ensure_logrotate_activated/tests/logrotate_configured.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#!/bin/bash

# platform = Oracle Linux 7,Oracle Linux 8
# platform = Oracle Linux 7,Oracle Linux 8,SUSE Linux Enterprise 16

{{% if product in [ 'sle16', 'slmicro6' ] %}}
{{{ bash_copy_distro_defaults('/usr/etc/logrotate.conf', '/etc/logrotate.conf') }}}
{{% endif %}}
# fix logrotate config
sed -i "s/\(weekly\|monthly\|yearly\)/daily/" /etc/logrotate.conf

Expand Down
6 changes: 6 additions & 0 deletions ...de/system/logging/log_rotation/ensure_logrotate_activated/tests/logrotate_missing.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
# platform = SUSE Linux Enterprise 16

if [ -e "/etc/logrotate.conf" ] ; then
rm "/etc/logrotate.conf"
fi
4 changes: 4 additions & 0 deletions .../system/logging/log_rotation/ensure_logrotate_activated/tests/logrotate_no_config.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@

# packages = logrotate,crontabs

{{% if product in [ 'sle16', 'slmicro6' ] %}}
{{{ bash_copy_distro_defaults('/usr/etc/logrotate.conf', '/etc/logrotate.conf') }}}
{{% endif %}}

sed -i "/^\s*(daily|weekly|monthly|yearly)/d" /etc/logrotate.conf
rm -f /etc/cron.daily/logrotate
6 changes: 3 additions & 3 deletions ...ng/log_rotation/ensure_logrotate_activated/tests/logrotate_no_cron_daily_no_timer.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

# packages = logrotate,crontabs

{{% if product == 'sle16' %}}
LOGROTATE_CONF_FILE="/usr/etc/logrotate.conf"
{{% else %}}
LOGROTATE_CONF_FILE="/etc/logrotate.conf"

{{% if product in [ 'sle16', 'slmicro6' ] %}}
{{{ bash_copy_distro_defaults('/usr/etc/logrotate.conf', "${LOGROTATE_CONF_FILE}") }}}
{{% endif %}}

# disable the timer
Expand Down
Loading