diff options
| author | varac <varacanero@zeromail.org> | 2014-09-25 11:22:34 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-09-25 11:22:34 +0200 |
| commit | 6b28dd3a0725fa336bb1a4b08471811604601d0f (patch) | |
| tree | 073f8de7c9c9cc1a5884c616093b3b18ed53ba7a /puppet/modules/site_apt/manifests/preferences/rsyslog.pp | |
| parent | af606967d39227390f5ef8403c64d693c1dfd76d (diff) | |
| parent | 308ac3cb420cbce7a6c67e03e887db4723aa8169 (diff) | |
Merge branch '6138_fix_rsyslog-gnutls_install' into develop
Diffstat (limited to 'puppet/modules/site_apt/manifests/preferences/rsyslog.pp')
| -rw-r--r-- | puppet/modules/site_apt/manifests/preferences/rsyslog.pp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/puppet/modules/site_apt/manifests/preferences/rsyslog.pp b/puppet/modules/site_apt/manifests/preferences/rsyslog.pp index 132a6e24..bfeaa7da 100644 --- a/puppet/modules/site_apt/manifests/preferences/rsyslog.pp +++ b/puppet/modules/site_apt/manifests/preferences/rsyslog.pp @@ -1,9 +1,13 @@ 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'] + 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; } } |