Revert "Make it work with jessie, III"

This reverts commit 41c40c4a9c30480d08813b55fded8e147718f44f.

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 0a1d98d..4e75925 100644 (file)
--- 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 != "testing/unstable" and $::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 1ef3e50..bb965be 100644 (file)
--- 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 != "testing/unstable" and $::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 == "testing/unstable" or $::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 != "testing/unstable" and $::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 b062790..5f017c9 100644 (file)
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,7 +7,7 @@
 #   include motd
 #
 class motd {
-       if $::lsbmajdistrelease == "testing/unstable" or $::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 fcf772a..2522138 100644 (file)
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -79,8 +79,7 @@ class munin {
        #               ensure => 'absent',
        #       }
        #}
-       warning("foo $::lsbmajdistrelease")
-       if $::lsbmajdistrelease == "testing/unstable" or $::lsbmajdistrelease >= 7 {
+       if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
                package { 'munin-async':
                        ensure => installed
                }