diff options
| author | varac <varacanero@zeromail.org> | 2014-09-24 13:55:20 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-09-25 11:22:14 +0200 |
| commit | 308ac3cb420cbce7a6c67e03e887db4723aa8169 (patch) | |
| tree | 073f8de7c9c9cc1a5884c616093b3b18ed53ba7a | |
| parent | 9da2a36155d3b96e0dc41cac3dd38f8b6c50efd2 (diff) | |
remove /etc/apt/preferences.d/fixed_rsyslog_anon_package (#6138)
This was a leftover from earlier versions, where we installed rsyslog
from the leap debian package repo.
Change-Id: I88a852f08b5aff3bd7b591b6220ac354463a9786
| -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; } } |