Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions jobs/syslog_forwarder/spec
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ templates:
syslog-release-forwarding-rules.conf.erb: config/syslog-release-forwarding-rules.conf
syslog-release-forwarding-setup.conf.erb: config/syslog-release-forwarding-setup.conf
syslog-release-vcap-filter.conf.erb: config/syslog-release-vcap-filter.conf
syslog.apparmor.erb: config/syslog.apparmor

packages:
- blackbox
Expand Down
4 changes: 4 additions & 0 deletions jobs/syslog_forwarder/templates/pre-start.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ mkdir -p /etc/rsyslog.d
# This cleans up after legacy config locations and previous starts
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
fi

<% unless p('syslog.migration.disabled') %>

cp $(dirname $0)/../config/syslog-release.conf /etc/rsyslog.d/20-syslog-release.conf
Expand Down
5 changes: 5 additions & 0 deletions jobs/syslog_forwarder/templates/syslog.apparmor.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# syslog_forwarder rules
/var/vcap/data/jobs/syslog_forwarder/*/config/* r,
/var/vcap/jobs/syslog_forwarder/config/* r,
/var/vcap/data/syslog_forwarder/** rw,
/var/vcap/sys/log/syslog_forwarder/** rw,