Skip to content

Commit 1bbd97f

Browse files
authored
Merge pull request #14731 from vojtapolasek/stab_fix_rsyslog_oval
Stabilization: Fix rsyslog rainerscript oval
2 parents 3af66f7 + 22086b1 commit 1bbd97f

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_remote_access_monitoring/oval/shared.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{{% macro object_remote_method(method, test_ref) %}}
2828
<ind:textfilecontent54_object id="obj_{{{ test_ref }}}" version="1">
2929
<ind:filepath operation="pattern match">^/etc/rsyslog\.(conf|d/.+\.conf)$</ind:filepath>
30-
<ind:pattern operation="pattern match">^[ \t]*(?:(?:\w+,)*{{{ method }}}(?:,\w+)*\.\*|\S+;{{{ method }}}\.\*|{{{ method }}}\.\*;\S+|\S+;{{{ method }}}\.\*;\S+)[ \t]+(?:(?!action\()\S+|action\([^)]*file\s*=\s*["'][^"']+["'][^)]*\))\s*$</ind:pattern>
30+
<ind:pattern operation="pattern match">^[ \t]*(?:(?:\w+,)*{{{ method }}}(?:,\w+)*\.\*|\S+;{{{ method }}}\.\*|{{{ method }}}\.\*;\S+|\S+;{{{ method }}}\.\*;\S+)[ \t]+(?:(?!(?i)action(?-i)\()\S+|(?i)action(?-i)\([^)]*(?i)file(?-i)\s*=\s*["'][^"']+["'][^)]*\))\s*$</ind:pattern>
3131
<ind:instance datatype="int">1</ind:instance>
3232
</ind:textfilecontent54_object>
3333
{{% endmacro %}}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
# platform = multi_platform_all
3+
4+
rm -rf /etc/rsyslog.d/*
5+
true > /etc/rsyslog.conf
6+
7+
# Use RainerScript action() syntax with capitalized File property
8+
echo '*.info;daemon.*;kern.*;auth.*;mail,authpriv,cron.none action(name="local-messages" type="omfile" File="/var/log/messages")' >> /etc/rsyslog.conf
9+
echo 'authpriv.* action(name="local-authpriv" type="omfile" File="/var/log/secure")' >> /etc/rsyslog.conf

0 commit comments

Comments
 (0)