Merge pull request #988 from till/r/php-ppa-discovery

Refactor: allow php to setup ppa

php/attributes/default.rb

@@ -1,3 +1,5 @@
+default['php']['ppa']['name'] = 'easybib-ppa'
+default['php']['ppa']['uri'] = ::EasyBib::Ppa.ppa_mirror(node)
 default['php']['ppa']['package_prefix'] = 'php5-easybib'
 
 default['php-apc'] = {}

php/metadata.rb

@@ -5,6 +5,8 @@
 license           'BSD License'
 supports          'ubuntu'
 
+depends 'apt'
+depends 'aptly'
 depends 'ies-apt'
 depends 'php-fpm'
 depends 'ohai'

php/recipes/dependencies-ppa.rb

@@ -1,3 +1,13 @@
 # used as a dependencies recipe for any php package from our ppa archive
-include_recipe 'ies-apt::easybib'
+include_recipe 'ies-apt::ppa'
+include_recipe 'aptly::gpg'
+
+ppa_config = node['php']['ppa']
+
+apt_repository ppa_config['name'] do
+  uri           ppa_config['uri']
+  distribution  node['lsb']['codename']
+  components    ['main']
+end
+
 include_recipe 'php-fpm::service'

php/spec/dependencies-ppa_spec.rb

@@ -6,6 +6,7 @@
 
   it 'adds ppa mirror configuration' do
     expect(chef_run).to include_recipe('ies-apt::ppa')
-    expect(chef_run).to include_recipe('ies-apt::easybib')
+    expect(chef_run).to include_recipe('aptly::gpg')
+    expect(chef_run).to add_apt_repository('easybib-ppa')
   end
 end