Fix Ubuntu 15.04 postfix provider fix

zuazo · Sep 16, 2015 · 2d42783 · 2d42783
1 parent cadff9e
commit 2d42783
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -219,8 +219,10 @@
   include_recipe 'postfix::default'
 
   # Fix Ubuntu 15.04 support:
-  r = resources(service: 'postfix')
-  r.provider(Chef::Provider::Service::Debian)
+  if node['platform'] == 'ubuntu' && node['platform_version'].to_i >= 15
+    r = resources(service: 'postfix')
+    r.provider(Chef::Provider::Service::Debian)
+  end
 end
 
 #==============================================================================

diff --git a/test/unit/recipes/default_spec.rb b/test/unit/recipes/default_spec.rb
@@ -354,6 +354,11 @@
       ChefSpec::SoloRunner.new(platform: 'centos', version: '6.0')
     end
 
+    it 'does not use Debian service provider for postfix' do
+      expect(chef_run).to enable_service('postfix')
+        .with_provider(nil)
+    end
+
     it 'creates www/html directory' do
       expect(chef_run).to create_directory('/var/www/html')
     end