MAAS

Merge ~ack/maas:rsyslog-only-own-socket into maas:master

  1. Git
  2. lp:~ack/maas
  3. rsyslog-only-own-socket
  4. Merge into master
Proposed by Alberto Donato
Status: Merged
Approved by: Alberto Donato
Approved revision: b25bab5a3eaee277cc48e139e481a9f2455b82f2
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ack/maas:rsyslog-only-own-socket
Merge into: maas:master
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
Blake Rouse (community) Approve
Review via email: mp+370195@code.launchpad.net

Commit message

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
Blake Rouse (blake-rouse) wrote :

Looks good. Lets get this into 2.6 as well.

File a bug about it so we can track its backport. Would be good to attach the bug to this MP as well for 2.7.

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