Fix PHP-FPM on Ubuntu 15.04

zuazo · Sep 26, 2015 · d43a45b · d43a45b
1 parent cf48390
commit d43a45b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/recipes/_php_fpm.rb b/recipes/_php_fpm.rb
@@ -42,3 +42,9 @@
     )
   end
 end
+
+# Fix Ubuntu 15.04 support:
+if node['platform'] == 'ubuntu' && node['platform_version'].to_i >= 15
+  r = resources(service: 'php-fpm')
+  r.provider(Chef::Provider::Service::Debian)
+end
diff --git a/test/unit/recipes/_php_fpm_spec.rb b/test/unit/recipes/_php_fpm_spec.rb
@@ -34,4 +34,23 @@
       "#{node['php-fpm']['pool_conf_dir']}/owncloud.conf"
     )
   end
+
+  it 'uses the default service provider for php-fpm' do
+    expect(chef_run).to enable_service('php-fpm')
+      .with_provider(nil)
+  end
+
+  context 'on Ubuntu 15.04' do
+    # Ubuntu 15.04 still not supported by fauxhai
+    before do
+      node.automatic['platform_family'] = 'debian'
+      node.automatic['platform'] = 'ubuntu'
+      node.automatic['platform_version'] = '15.04'
+    end
+
+    it 'uses Debian service provider for php-fpm' do
+      expect(chef_run).to enable_service('php-fpm')
+        .with_provider(Chef::Provider::Service::Debian)
+    end
+  end # context on Ubuntu 15.04
 end