From b503e655271d755baa4ac51861c25ed5a7872b14 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 22 May 2014 12:14:28 -0400 Subject: Move rsyslog preferences snippet to site_apt::preferences::rsyslog, to group it with the other preferences snippets Change-Id: I83928c6b82cd6218a80c95475729cb57f146ff85 --- puppet/modules/site_apt/manifests/preferences/rsyslog.pp | 9 +++++++++ puppet/modules/site_config/manifests/syslog.pp | 7 +------ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 puppet/modules/site_apt/manifests/preferences/rsyslog.pp diff --git a/puppet/modules/site_apt/manifests/preferences/rsyslog.pp b/puppet/modules/site_apt/manifests/preferences/rsyslog.pp new file mode 100644 index 00000000..132a6e24 --- /dev/null +++ b/puppet/modules/site_apt/manifests/preferences/rsyslog.pp @@ -0,0 +1,9 @@ +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'] + } +} diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp index 8eac4242..26c65f02 100644 --- a/puppet/modules/site_config/manifests/syslog.pp +++ b/puppet/modules/site_config/manifests/syslog.pp @@ -1,11 +1,6 @@ class site_config::syslog { - apt::preferences_snippet { 'rsyslog_anon_depends': - package => 'libestr0 librelp0 rsyslog*', - priority => '999', - pin => 'release a=wheezy-backports', - before => Class['rsyslog::install'] - } + include site_apt::preferences::rsyslog class { 'rsyslog::client': log_remote => false, -- cgit v1.2.3