replaces shared-lsb by puppetlabs/stdlib

diff --git a/Modulefile b/Modulefile
index 5954df4617d8e1a6c72d0b6631f1b1868f1fc6ce..5e4f92d63a83229d28e43e01c71f49231360d2cd 100644 (file)
--- a/Modulefile
+++ b/Modulefile
@@ -7,4 +7,4 @@ summary 'ssh daemon configuration'
 description 'Manages sshd_config'
 project_page 'https://github.com/duritong/puppet-sshd'
 
-#dependency 'puppetlabs/stdlib', '>= 0.1.6'
\ No newline at end of file
+dependency 'puppetlabs/stdlib', '>= 2.0.0'
\ No newline at end of file

diff --git a/Puppetfile b/Puppetfile
index 113b12f38e6c020a1b6391f1b48f78872243f812..166d3b4deeed644d1369ee7c5f43c7930b936384 100644 (file)
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,3 +1,3 @@
 forge 'http://forge.puppetlabs.com'
 
-#mod 'puppetlabs/stdlib', '>=0.1.6'
\ No newline at end of file
+mod 'puppetlabs/stdlib', '>=2.0.0'
\ No newline at end of file

diff --git a/Puppetfile.lock b/Puppetfile.lock
index 51949ef570911c62f10ed2bbea282432bdf4425e..f9381858b7a93c9d0c0f735da5f38a0081b0647e 100644 (file)
--- a/Puppetfile.lock
+++ b/Puppetfile.lock
@@ -1,2 +1,8 @@
+FORGE
+  remote: http://forge.puppetlabs.com
+  specs:
+    puppetlabs/stdlib (4.1.0)
+
 DEPENDENCIES
+  puppetlabs/stdlib (>= 2.0.0)
 

diff --git a/README.md b/README.md
index bc85552e6689e87537399eff2f50d7e282f48d61..cafdf117051fa31839617a4f57fbe61ce69732b7 100644 (file)
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ This module requires puppet => 2.6, and the following modules are required
 pre-dependencies:
 
 - shared-common: `git://labs.riseup.net/shared-common`
-- shared-lsb: `git://labs.riseup.net/shared-lsb`
+- [puppetlabs/stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) >= 2.x
 
 ## OpenSSH Server
 

diff --git a/manifests/debian.pp b/manifests/debian.pp
index ced5db7380a7d5ead1e77020e254d767303d123f..baacbba2063329153828a69f8ca30158104be68e 100644 (file)
--- 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',

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
new file mode 100644 (file)
index 0000000..c1d9b6f
--- /dev/null
+++ b/spec/classes/init_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe 'sshd' do
+
+
+  shared_examples "a Linux OS" do
+    it { should compile.with_all_deps }
+    it { should contain_class('sshd') }
+    it { should contain_class('sshd::client') }
+  end
+
+  context "Debian OS" do
+    let :facts do
+      {
+        :operatingsystem => 'Debian',
+        :osfamily        => 'Debian',
+        :lsbdistcodename => 'wheezy',
+      }
+    end
+    it_behaves_like "a Linux OS"
+    it { should contain_package('lsb-release') }
+  end
+
+end
\ No newline at end of file

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2d836173e51fdf2f56b75e960b958aee40ad06d5..b4123fdecf4467d14942be985d653eecfbf4d147 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.join(dir, 'lib')
 require 'puppet'
 require 'rspec'
 require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-hiera-puppet'
+#require 'rspec-hiera-puppet'
 require 'rspec-puppet/coverage'
 require 'rspec/autorun'
 

diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb
index 44e03371855d0ca0e3f6c8a8e74e830941001b67..2c6812fc2bb4dd40cd2f316c8322dfe4c973faab 100644 (file)
--- a/spec/spec_helper_system.rb
+++ b/spec/spec_helper_system.rb
@@ -20,5 +20,6 @@ RSpec.configure do |c|
     puppet_install
     # Install modules and dependencies
     puppet_module_install(:source => proj_root, :module_name => 'sshd')
+    shell('puppet module install puppetlabs-stdlib')
   end
 end