diff options
| author | Micah <micah@leap.se> | 2016-02-02 11:02:17 -0500 |
|---|---|---|
| committer | Micah <micah@leap.se> | 2016-02-11 10:35:39 -0500 |
| commit | b8bca2d764bbf13a92e7ea861ab510db9b18e3bb (patch) | |
| tree | 28666c10d09b53d7d7a4f8276454b4b8c0d6d7e0 | |
| parent | cee2702b9c66e7e303494822993f46986685d87a (diff) | |
Disable journald in order to resolve IP logging subversion (#7863)
Change-Id: I9cee85c19d86dc7c8d70c4cdeb2e7426191b57a5
| -rw-r--r-- | puppet/modules/journald/manifests/init.pp | 7 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/syslog.pp | 19 |
2 files changed, 23 insertions, 3 deletions
diff --git a/puppet/modules/journald/manifests/init.pp b/puppet/modules/journald/manifests/init.pp new file mode 100644 index 00000000..879baba4 --- /dev/null +++ b/puppet/modules/journald/manifests/init.pp @@ -0,0 +1,7 @@ +class journald { + + service { 'systemd-journald': + ensure => running, + enable => true, + } +} 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 } |