From 87fa2227c8d51fc573438204e20f39037a52bee0 Mon Sep 17 00:00:00 2001
From: Bill MacAllister <whm@stanford.edu>
Date: Tue, 11 Feb 2014 13:47:10 -0800
Subject: [PATCH] release/003.010 - rsyslog preferences file
Add an apt preferences file to use the rsyslog version from
backports. Remove preferences installation from the syslog
module.
---
.../etc/apt/preferences.d/rsyslog-wheezy | 52 -------------------
manifests/os/debian.pp | 2 +
manifests/syslog/config/rsyslog.pp | 10 +---
templates/os/preferences/rsyslog.erb | 23 ++++++++
4 files changed, 27 insertions(+), 60 deletions(-)
delete mode 100644 files/syslog/etc/apt/preferences.d/rsyslog-wheezy
create mode 100644 templates/os/preferences/rsyslog.erb
diff --git a/files/syslog/etc/apt/preferences.d/rsyslog-wheezy b/files/syslog/etc/apt/preferences.d/rsyslog-wheezy
deleted file mode 100644
index f6674c5..0000000
--- a/files/syslog/etc/apt/preferences.d/rsyslog-wheezy
+++ /dev/null
@@ -1,52 +0,0 @@
-Package: rsyslog
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: rsyslog-doc
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: rsyslog-gnutls
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: rsyslog-gssapi
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: rsyslog-mongodb
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: rsyslog-mysql
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: rsyslog-pgsql
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: rsyslog-relp
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: librelp0
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: libestr0
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: libjson0
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: liblognorm0
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
-Package: init-system-helpers
-Pin: release a=wheezy-backports
-Pin-Priority: 995
-
diff --git a/manifests/os/debian.pp b/manifests/os/debian.pp
index e4823c2..9175b12 100644
--- a/manifests/os/debian.pp
+++ b/manifests/os/debian.pp
@@ -79,6 +79,8 @@ class base::os::debian {
content => '';
'/etc/apt/preferences.d/backports':
content => template('base/os/preferences/backports.erb');
+ '/etc/apt/preferences.d/backports':
+ content => template('base/os/preferences/rsyslog.erb');
}
}
diff --git a/manifests/syslog/config/rsyslog.pp b/manifests/syslog/config/rsyslog.pp
index 96aca83..32fb798 100644
--- a/manifests/syslog/config/rsyslog.pp
+++ b/manifests/syslog/config/rsyslog.pp
@@ -46,19 +46,13 @@ define base::syslog::config::rsyslog(
} else {
$rsyslog_tmpl = 'etc/rsyslog.d/20-templates.conf'
$rsyslog_def = 'etc/rsyslog.d/95-default.conf.erb'
- # handle preferences when v7 is requested
+ # Warn if trying to use v7 in the wrong place
case $::operatingsystem {
'debian', 'ubuntu': {
case $::lsbdistcodename {
- 'squeeze': {
+ 'lenny', 'squeeze': {
fail('rsyslog v7 not supported on squeeze')
}
- 'wheezy': {
- file { '/etc/apt/preferences.d/rsyslog':
- ensure => present,
- source => 'puppet:///modules/base/syslog/etc/apt/preferences.d/rsyslog-wheezy',
- }
- }
}
}
}
diff --git a/templates/os/preferences/rsyslog.erb b/templates/os/preferences/rsyslog.erb
new file mode 100644
index 0000000..378d6d2
--- /dev/null
+++ b/templates/os/preferences/rsyslog.erb
@@ -0,0 +1,23 @@
+Package: rsyslog*
+Pin: release a=<%= lsbdistcodename %>-backports
+Pin-Priority: 995
+
+Package: librelp0
+Pin: release a=<%= lsbdistcodename %>-backports
+Pin-Priority: 995
+
+Package: libestr0
+Pin: release a=<%= lsbdistcodename %>-backports
+Pin-Priority: 995
+
+Package: libjson0
+Pin: release a=<%= lsbdistcodename %>-backports
+Pin-Priority: 995
+
+Package: liblognorm0
+Pin: release a=<%= lsbdistcodename %>-backports
+Pin-Priority: 995
+
+Package: init-system-helpers
+Pin: release a=<%= lsbdistcodename %>-backports
+Pin-Priority: 995
--
GitLab