Add support for Debian 8. closes #47

diff --git a/manifests/server/params.pp b/manifests/server/params.pp
index 5f2fc3e187de877f7d7e72c4b905a90226537a97..ba0c1be421fddb162fc9c0e6e312b7de93205ed8 100644 (file)
--- a/manifests/server/params.pp
+++ b/manifests/server/params.pp
@@ -3,12 +3,14 @@
 class samba::server::params {
   case $::osfamily {
     'Redhat': { $service_name = 'smb' }
-
-    #On Debian family: Debian 7 => samba , Ubuntu => smbd
-    #Others, I don't know, hope 'samba' will works
     'Debian': {
-      case $::operatingsystem{
-        'Debian': { $service_name = 'samba' }
+      case $::operatingsystem {
+        'Debian': {
+          case $::operatingsystemmajrelease {
+            '8' : { $service_name = 'smbd' }
+            default: { $service_name = 'samba' }
+          }
+        }
         'Ubuntu': { $service_name = 'smbd'
                     $nmbd_name = 'nmbd' }
         default: { $service_name = 'samba' }

diff --git a/spec/acceptance/nodesets/debian-81-x64.yml b/spec/acceptance/nodesets/debian-81-x64.yml
new file mode 100644 (file)
index 0000000..3b1d8aa
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-81-x64.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  debian-81-x64:
+    roles:
+      - master
+    platform: debian-8-amd64
+    box: lazyfrosch/debian-8-jessie-amd64-puppet
+    box_url: https://vagrantcloud.com/lazyfrosch/boxes/debian-8-jessie-amd64-puppet
+    hypervisor: vagrant
+
+CONFIG:
+  log_level: verbose
+  type: foss

diff --git a/spec/classes/samba__server__service_spec.rb b/spec/classes/samba__server__service_spec.rb
index ada7f21af1edd291ca0a06074e9844f7aea61e55..4352ec2dd5470afbd845980d7452ba6ebf2e2d00 100644 (file)
--- a/spec/classes/samba__server__service_spec.rb
+++ b/spec/classes/samba__server__service_spec.rb
@@ -7,8 +7,18 @@ describe 'samba::server::service' do
     it { should contain_service('samba').with_require('Class[Samba::Server::Config]') }
 
     context 'Debian' do
-      let(:facts) {{ :osfamily => 'Debian', :operatingsystem => 'Debian' }}
-      it { should contain_service('samba') }
+      context 'wheezy' do
+        let(:facts) {{ :osfamily => 'Debian',
+                       :operatingsystem => 'Debian',
+                       :operatingsystemmajrelease => '7' }}
+        it { should contain_service('samba') }
+      end
+      context 'jessie' do
+        let(:facts) {{ :osfamily => 'Debian',
+                       :operatingsystem => 'Debian',
+                       :operatingsystemmajrelease => '8' }}
+        it { should contain_service('smbd') }
+      end
     end
 
     context 'Ubuntu' do