diff options
| -rw-r--r-- | puppet/modules/site_config/manifests/remove.pp | 7 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/remove/jessie.pp | 9 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/syslog.pp | 8 |
3 files changed, 23 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/remove.pp b/puppet/modules/site_config/manifests/remove.pp index b1ad1a2b..443df9c2 100644 --- a/puppet/modules/site_config/manifests/remove.pp +++ b/puppet/modules/site_config/manifests/remove.pp @@ -1,4 +1,11 @@ # remove leftovers from previous deploys class site_config::remove { include site_config::remove::files + + case $::operatingsystemrelease { + /^8.*/: { + include site_config::remove::jessie + } + default: { } + } } diff --git a/puppet/modules/site_config/manifests/remove/jessie.pp b/puppet/modules/site_config/manifests/remove/jessie.pp new file mode 100644 index 00000000..cbeaae05 --- /dev/null +++ b/puppet/modules/site_config/manifests/remove/jessie.pp @@ -0,0 +1,9 @@ +# remove possible leftovers after upgrading from wheezy to jessie +class site_config::remove::jessie { + + tidy { + '/etc/apt/preferences.d/rsyslog_anon_depends': + notify => Exec['refresh_apt']; + } + +} diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp index e94ff62f..c397dc15 100644 --- a/puppet/modules/site_config/manifests/syslog.pp +++ b/puppet/modules/site_config/manifests/syslog.pp @@ -1,7 +1,13 @@ # configure rsyslog on all nodes class site_config::syslog { - include site_apt::preferences::rsyslog + # only pin rsyslog packages to backports on wheezy + case $::operatingsystemrelease { + /^7.*/: { + include site_apt::preferences::rsyslog + } + default: { } + } class { 'rsyslog::client': log_remote => false, |