From 78f1ff00d09d0ebf8f132e70444b9bcf030b6711 Mon Sep 17 00:00:00 2001
From: Tomas Barton <barton.tomas@gmail.com>
Date: Sun, 26 Jan 2014 09:36:35 +0100
Subject: replaces shared-lsb by puppetlabs/stdlib

---
 manifests/debian.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'manifests/debian.pp')

diff --git a/manifests/debian.pp b/manifests/debian.pp
index ced5db7..baacbba 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,7 +1,9 @@
 class sshd::debian inherits sshd::linux {
 
   # the templates for Debian need lsbdistcodename
-  require lsb
+  ensure_resource('package', 'lsb-release', {'ensure' => 'present' })
+  #requires stdlib >= 3.2
+  #ensure_packages(['lsb-release'])
 
   Package[openssh]{
     name => 'openssh-server',
-- 
cgit v1.2.3


From 9dc5a1db18ac634512a5509685eaf3b3a60cf6c7 Mon Sep 17 00:00:00 2001
From: Tomas Barton <barton.tomas@gmail.com>
Date: Mon, 27 Jan 2014 00:04:33 +0100
Subject: removed special no-restart status for etch

---
 manifests/debian.pp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'manifests/debian.pp')

diff --git a/manifests/debian.pp b/manifests/debian.pp
index baacbba..ff2d7b1 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -9,15 +9,10 @@ class sshd::debian inherits sshd::linux {
     name => 'openssh-server',
   }
 
-  $sshd_restartandstatus = $::lsbdistcodename ? {
-    etch    => false,
-    default => true
-  }
-
   Service[sshd]{
     name       => 'ssh',
     pattern    => 'sshd',
-    hasstatus  => $sshd_restartandstatus,
-    hasrestart => $sshd_restartandstatus,
+    hasstatus  => true,
+    hasrestart => true,
   }
 }
-- 
cgit v1.2.3


From bf16ec7bc701ea7cfda7d64319920e3b9cca4a16 Mon Sep 17 00:00:00 2001
From: Tomas Barton <barton.tomas@gmail.com>
Date: Mon, 27 Jan 2014 00:14:34 +0100
Subject: removed lsb-release package

---
 manifests/debian.pp       | 5 -----
 spec/classes/init_spec.rb | 2 --
 2 files changed, 7 deletions(-)

(limited to 'manifests/debian.pp')

diff --git a/manifests/debian.pp b/manifests/debian.pp
index ff2d7b1..d827078 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,10 +1,5 @@
 class sshd::debian inherits sshd::linux {
 
-  # the templates for Debian need lsbdistcodename
-  ensure_resource('package', 'lsb-release', {'ensure' => 'present' })
-  #requires stdlib >= 3.2
-  #ensure_packages(['lsb-release'])
-
   Package[openssh]{
     name => 'openssh-server',
   }
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 7628be0..e3003d1 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -41,7 +41,6 @@ describe 'sshd' do
       }
     end
     it_behaves_like "a Linux OS"
-    it { should contain_package('lsb-release') }
     it { should contain_package('openssh') }
     it { should contain_class('sshd::debian') }
     it { should contain_service('sshd').with(
@@ -56,7 +55,6 @@ describe 'sshd' do
         }
       end
       it_behaves_like "a Linux OS"
-      it { should contain_package('lsb-release') }
       it { should contain_package('openssh') }
       it { should contain_service('sshd').with({
         :hasrestart => true
-- 
cgit v1.2.3