MAAS

Merge ~ack/maas:backport-rsyslog-fix into maas:2.6

  1. Git
  2. lp:~ack/maas
  3. backport-rsyslog-fix
  4. Merge into 2.6
Proposed by Alberto Donato
Status: Merged
Approved by: Alberto Donato
Approved revision: e053250915e20d328c33c6c4643e748835f55228
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ack/maas:backport-rsyslog-fix
Merge into: maas:2.6
Diff against target: 12 lines (+1/-2)
1 file modified
src/provisioningserver/templates/syslog/rsyslog.conf.template (+1/-2)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Review via email: mp+370204@code.launchpad.net

Commit message

backport e832cade5f9619ad7b526c2af49b9ce48c6ef230 - LP: #1836769 - rsyslog: only listen on its own socket, not the system one (/dev/log)

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) :
review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/templates/syslog/rsyslog.conf.template b/src/provisioningserver/templates/syslog/rsyslog.conf.template
2index 64928e7..134be29 100644
3--- a/src/provisioningserver/templates/syslog/rsyslog.conf.template
4+++ b/src/provisioningserver/templates/syslog/rsyslog.conf.template
5@@ -1,6 +1,5 @@
6 # Unix socket.
7-module(load="imuxsock")
8-input(type="imuxsock" socket="{{work_dir}}/log.sock")
9+module(load="imuxsock" SysSock.Name="{{work_dir}}/log.sock")
10
11 # Enable tcp.
12 module(load="imtcp")

Subscribers

People subscribed via source and target branches