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.

files/syslog/etc/apt/preferences.d/rsyslog-wheezy

-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
-

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');
     }
   }
 

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',
-              }
-            }
           }
         }
       }

templates/os/preferences/rsyslog.erb

+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