Downgrade mysql cookbook for now
It doesn't play well with our current dev server setup
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
#
|
||||
# Cookbook Name:: xml
|
||||
# Cookbook:: xml
|
||||
# Recipe:: default
|
||||
#
|
||||
# Copyright 2010-2015, Chef Software, Inc.
|
||||
# Copyright:: 2010-2017, Chef Software, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -17,8 +17,10 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
node['xml']['packages'].each do |pkg|
|
||||
r = package pkg do
|
||||
if node['xml']['packages'].empty?
|
||||
Chef::Log.warn("No XML packages defined for installation in node['xml']['packages'] for your platform.")
|
||||
else
|
||||
r = package node['xml']['packages'] do
|
||||
action(node['xml']['compiletime'] ? :nothing : :install)
|
||||
end
|
||||
r.run_action(:install) if node['xml']['compiletime']
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#
|
||||
# Cookbook Name:: xml
|
||||
# Cookbook:: xml
|
||||
# Recipe:: ruby
|
||||
#
|
||||
# Author:: Joseph Holsten (<joseph@josephholsten.com>)
|
||||
#
|
||||
# Copyright 2008-2013, Chef Software, Inc.
|
||||
# Copyright:: 2008-2017, Chef Software, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -19,14 +19,11 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
include_recipe 'chef-sugar'
|
||||
|
||||
execute 'apt-get update' do
|
||||
ignore_failure true
|
||||
action :nothing
|
||||
end.run_action(:run) if 'debian' == node['platform_family']
|
||||
|
||||
node.default['build-essential']['compile_time'] = true
|
||||
node.default['xml']['compiletime'] = true
|
||||
include_recipe 'build-essential::default'
|
||||
include_recipe 'xml::default'
|
||||
@@ -38,5 +35,5 @@ end
|
||||
chef_gem 'nokogiri' do
|
||||
version node['xml']['nokogiri']['version'] if node['xml']['nokogiri']['version']
|
||||
action :install
|
||||
compile_time true if defined? compile_time
|
||||
compile_time true
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user