diff options
| author | kwadronaut <kwadronaut@leap.se> | 2014-05-17 09:07:48 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2014-05-17 09:07:48 +0200 |
| commit | d07f231db7e77fba2800fa6da823b73b58249a84 (patch) | |
| tree | 0aa3a3344c9b888dec67033d52445ef7ea80619f | |
| parent | 439b7c49d3de20f33ce0a61b42fedde3fc65f2eb (diff) | |
| parent | 6c6f7c5053ea83a67b4d4308aeb2fc339c7325b2 (diff) | |
fixes #5533 and updates rsyslog Merge branch 'rsyslog_backport' into develop
| -rw-r--r-- | puppet/modules/site_config/manifests/syslog.pp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp index d3abeca1..8eac4242 100644 --- a/puppet/modules/site_config/manifests/syslog.pp +++ b/puppet/modules/site_config/manifests/syslog.pp @@ -1,16 +1,7 @@ class site_config::syslog { - # we need to pull in rsyslog from the leap repository until it is availbale in - # wheezy-backports - apt::preferences_snippet { 'fixed_rsyslog_anon_package': - package => 'rsyslog*', - priority => '999', - pin => 'release o=leap.se', - before => Class['rsyslog::install'] - } - apt::preferences_snippet { 'rsyslog_anon_depends': - package => 'libestr0 librelp0', + package => 'libestr0 librelp0 rsyslog*', priority => '999', pin => 'release a=wheezy-backports', before => Class['rsyslog::install'] |