From a78f21da77633dcb0052c1388ab20714e88f4bd8 Mon Sep 17 00:00:00 2001 From: Stefan Galinski <stefan@sgalinski.de> Date: Tue, 2 Aug 2016 21:38:04 +0200 Subject: [PATCH] [FEATURE] Xenial compatibility --- metadata.rb | 4 +++- recipes/default.rb | 28 ++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/metadata.rb b/metadata.rb index d733fff..5fa6cec 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,9 @@ maintainer 'sgalinski Internet Services' maintainer_email 'stefan@sgalinski.de' license 'MIT' description 'Installs/configures XDebug.' -long_description 'Installs/configures XDebug.' +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '1.0.0' +issues_url 'https://gitlab.sgalinski.de/chef-cookbooks/xdebug/issues' +source_url 'https://gitlab.sgalinski.de/chef-cookbooks/xdebug' recipe 'xdebug::default', 'Installs/configures XDebug.' \ No newline at end of file diff --git a/recipes/default.rb b/recipes/default.rb index 52cdac3..d875887 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -22,14 +22,26 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -package 'php5-xdebug' +if node['platform_version'] == '16.04' + package 'php-xdebug' -template '/etc/php5/apache2/conf.d/xdebug.ini' do - mode '0644' - notifies :restart, 'service[apache2]', :delayed -end + template '/etc/php/7.0/fpm/conf.d/xdebug.ini' do + mode '0644' + end -template '/etc/php5/cli/conf.d/xdebug.ini' do - mode '0644' - notifies :restart, 'service[apache2]', :delayed + template '/etc/php/7.0/cli/conf.d/xdebug.ini' do + mode '0644' + notifies :restart, 'service[apache2]', :delayed + end +else + package 'php5-xdebug' + + template '/etc/php5/apache2/conf.d/xdebug.ini' do + mode '0644' + end + + template '/etc/php5/cli/conf.d/xdebug.ini' do + mode '0644' + notifies :restart, 'service[apache2]', :delayed + end end \ No newline at end of file -- GitLab