summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2014-05-12 18:56:25 +0200
committerkwadronaut <kwadronaut@leap.se>2014-05-17 09:05:37 +0200
commit6c6f7c5053ea83a67b4d4308aeb2fc339c7325b2 (patch)
treee793bca32ad4543786a2a49042d716c8668505a1 /puppet/modules/site_config/manifests
parent071547967cc00acf18bf68b78e350131017852b9 (diff)
change rsyslog pin from leaps debian repo to backports (fixes #5533)
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/syslog.pp11
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']