From b8bca2d764bbf13a92e7ea861ab510db9b18e3bb Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 2 Feb 2016 11:02:17 -0500 Subject: Disable journald in order to resolve IP logging subversion (#7863) Change-Id: I9cee85c19d86dc7c8d70c4cdeb2e7426191b57a5 --- puppet/modules/site_config/manifests/syslog.pp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_config') diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp index c397dc15..d1deefcd 100644 --- a/puppet/modules/site_config/manifests/syslog.pp +++ b/puppet/modules/site_config/manifests/syslog.pp @@ -4,12 +4,25 @@ class site_config::syslog { # only pin rsyslog packages to backports on wheezy case $::operatingsystemrelease { /^7.*/: { - include site_apt::preferences::rsyslog + include ::site_apt::preferences::rsyslog + } + # on jessie+ systems, systemd and journald are enabled, + # and journald logs IP addresses, so we need to disable + # it until a solution is found, (#7863): + # https://github.com/systemd/systemd/issues/2447 + default: { + include ::journald + augeas { + 'disable_journald': + incl => '/etc/systemd/journald.conf', + lens => 'Puppet.lns', + changes => 'set /files/etc/systemd/journald.conf/Journal/Storage \'none\'', + notify => Service['systemd-journald']; + } } - default: { } } - class { 'rsyslog::client': + class { '::rsyslog::client': log_remote => false, log_local => true } -- cgit v1.2.3