diff options
| author | Micah Anderson <micah@leap.se> | 2014-05-22 12:14:28 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-05-22 12:14:28 -0400 |
| commit | b503e655271d755baa4ac51861c25ed5a7872b14 (patch) | |
| tree | f0a2a431a15b24c8195c06a730be5cf1abd64b24 | |
| parent | ba13b08cd06010dd8cd172d0e3b5b296f9981edf (diff) | |
Move rsyslog preferences snippet to site_apt::preferences::rsyslog, to
group it with the other preferences snippets
Change-Id: I83928c6b82cd6218a80c95475729cb57f146ff85
| -rw-r--r-- | puppet/modules/site_apt/manifests/preferences/rsyslog.pp | 9 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/syslog.pp | 7 |
2 files changed, 10 insertions, 6 deletions
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, |