Skip to content

Parse apparmor's rsyslogd profile after adding a new config #216

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

Merged
merged 1 commit into from
Sep 1, 2025
Merged

Parse apparmor's rsyslogd profile after adding a new config #216

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
10 changes: 9 additions & 1 deletion jobs/syslog_forwarder/templates/pre-start.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ rm -f /etc/rsyslog.d/rsyslog.conf /etc/rsyslog.d/*-syslog-release*conf

if [ -d "/etc/apparmor.d/rsyslog.d/" ]; then
cp $(dirname $0)/../config/syslog.apparmor /etc/apparmor.d/rsyslog.d/syslog.apparmor

if command -v apparmor_parser &>/dev/null && [ -f "/etc/apparmor.d/usr.sbin.rsyslogd" ]; then
apparmor_parser -r /etc/apparmor.d/usr.sbin.rsyslogd
fi
fi

<% unless p('syslog.migration.disabled') %>
Expand Down Expand Up @@ -47,4 +51,8 @@ chmod 0644 /etc/rsyslog.d/40-syslog-release-file-exclusion.conf

<% end %>

service rsyslog restart
if command -v systemctl &>/dev/null; then
systemctl restart rsyslog
else
service rsyslog restart
fi
11 changes: 10 additions & 1 deletion jobs/syslog_storer/templates/pre-start.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,14 @@ mkdir -p /etc/rsyslog.d
cp $(dirname $0)/../config/rsyslog.conf /etc/rsyslog.d/rsyslog.conf
if [ -d "/etc/apparmor.d/rsyslog.d/" ]; then
cp $(dirname $0)/../config/syslog.apparmor /etc/apparmor.d/rsyslog.d/syslog.apparmor

if command -v apparmor_parser &>/dev/null && [ -f "/etc/apparmor.d/usr.sbin.rsyslogd" ]; then
apparmor_parser -r /etc/apparmor.d/usr.sbin.rsyslogd
fi
fi

if command -v systemctl &>/dev/null; then
systemctl restart rsyslog
else
service rsyslog restart
fi
service rsyslog restart