From 2d2d25eb5b5c376c5f73551fa11f5acaf866a60d Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 6 Nov 2014 18:43:19 +0000
Subject: [PATCH] Make it work with jessie, II

---
 modules/bacula/manifests/client.pp   | 2 +-
 modules/debian-org/manifests/init.pp | 6 +++---
 modules/motd/manifests/init.pp       | 2 +-
 modules/munin/manifests/init.pp      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 1ff49df9..4e759253 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -48,7 +48,7 @@ class bacula::client inherits bacula {
 		require => Package['bacula-fd'],
 		notify  => Service['bacula-fd'],
 	}
-	if $::lsbmajdistrelease < 7 {
+	if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
 		file { '/etc/apt/preferences.d/dsa-bacula-client':
 			content => template('bacula/apt.preferences.bacula-client.erb'),
 			mode    => '0444',
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index f0059285..f441ac51 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -8,7 +8,7 @@ class debian-org {
 	} else {
 		$mirror = 'http://http.debian.net/debian/'
 	}
-	if $::lsbmajdistrelease < 7 {
+	if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
 		$mirror_backports = 'http://backports.debian.org/debian-backports/'
 	} else {
 		$mirror_backports = $mirror
@@ -60,7 +60,7 @@ class debian-org {
 		ensure => installed,
 	}
 
-	if $::lsbmajdistrelease >= 7 {
+	if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
 		package { 'libfilesystem-ruby1.9.1':
 			ensure => installed,
 		}
@@ -122,7 +122,7 @@ class debian-org {
 		suite      => "${::lsbdistcodename}/updates",
 		components => ['main','contrib','non-free']
 	}
-	if $::lsbmajdistrelease < 7 {
+	if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
 		site::aptrepo { 'debian-lts':
 			url        => $mirror,
 			suite      => "${::lsbdistcodename}-lts",
diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 89362064..5f017c91 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,7 +7,7 @@
 #   include motd
 #
 class motd {
-	if $::lsbmajdistrelease >= 7 {
+	if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
 		$fname  = '/etc/update-motd.d/puppet-motd'
 		$notify = undef
 		$mode   = '0555'
diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 19b563f4..25221383 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -79,7 +79,7 @@ class munin {
 	#		ensure => 'absent',
 	#	}
 	#}
-	if $::lsbmajdistrelease >= 7 {
+	if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
 		package { 'munin-async':
 			ensure => installed
 		}
-- 
2.39.2