summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/preferences/rsyslog.pp13
-rw-r--r--puppet/modules/site_config/manifests/remove/jessie.pp5
-rw-r--r--puppet/modules/site_config/manifests/syslog.pp30
3 files changed, 14 insertions, 34 deletions
diff --git a/puppet/modules/site_apt/manifests/preferences/rsyslog.pp b/puppet/modules/site_apt/manifests/preferences/rsyslog.pp
deleted file mode 100644
index bfeaa7da..00000000
--- a/puppet/modules/site_apt/manifests/preferences/rsyslog.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class site_apt::preferences::rsyslog {
-
- apt::preferences_snippet {
- 'rsyslog_anon_depends':
- package => 'libestr0 librelp0 rsyslog*',
- priority => '999',
- pin => 'release a=wheezy-backports',
- before => Class['rsyslog::install'];
-
- 'fixed_rsyslog_anon_package':
- ensure => absent;
- }
-}
diff --git a/puppet/modules/site_config/manifests/remove/jessie.pp b/puppet/modules/site_config/manifests/remove/jessie.pp
index a3ac19b7..2fdc4794 100644
--- a/puppet/modules/site_config/manifests/remove/jessie.pp
+++ b/puppet/modules/site_config/manifests/remove/jessie.pp
@@ -7,8 +7,9 @@ class site_config::remove::jessie {
}
apt::preferences_snippet {
- [ 'facter', 'obfsproxy', 'python-twisted', 'unbound', 'passenger' ]:
- ensure => absent;
+ [ 'facter', 'obfsproxy', 'python-twisted', 'unbound', 'passenger',
+ 'rsyslog_anon_depends' ]:
+ ensure => absent;
}
}
diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp
index 591e0601..096d5d77 100644
--- a/puppet/modules/site_config/manifests/syslog.pp
+++ b/puppet/modules/site_config/manifests/syslog.pp
@@ -1,25 +1,17 @@
# configure rsyslog on all nodes
class site_config::syslog {
- # only pin rsyslog packages to backports on wheezy
- case $::operatingsystemrelease {
- /^7.*/: {
- 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'];
- }
- }
+ # 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
+ 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'];
}
class { '::rsyslog::client':