Revert "Make it work with jessie, II"

[dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 9f3881047d05bebb21f0fd01ffe0728dd0079a6a..de8091bbc6297dd27bb736bb46f3daf534b8a241 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 < 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 >= 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 < 7 {
                site::aptrepo { 'debian-lts':
                        url        => $mirror,
                        suite      => "${::lsbdistcodename}-lts",
@@ -305,8 +305,7 @@ class debian-org {
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                refreshonly => true
        }
-       exec { 'puppetmaster restart':
-               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+       exec { 'service puppetmaster restart':
                refreshonly => true
        }
        exec { 'service rc.local start':