Update cookbooks and add wordpress cookbook
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
# Cookbook Name:: xml
|
||||
# Recipe:: default
|
||||
#
|
||||
# Copyright 2010-2013, Chef Software, Inc.
|
||||
# Copyright 2010-2015, 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.
|
||||
|
||||
@@ -32,15 +32,11 @@ include_recipe 'build-essential::default'
|
||||
include_recipe 'xml::default'
|
||||
|
||||
if node['xml']['nokogiri']['use_system_libraries']
|
||||
if node['xml']['nokogiri']['version'].nil? ||
|
||||
version(node['xml']['nokogiri']['version']).satisfies?('> 1.6.1')
|
||||
Chef::Application.fatal!("You must specify a version less than or equal to 1.6.1 of nokogiri to use system libraries. You set: #{node['xml']['nokogiri']['version']}.")
|
||||
else
|
||||
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] = node['xml']['nokogiri']['use_system_libraries'].to_s
|
||||
end
|
||||
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] = node['xml']['nokogiri']['use_system_libraries'].to_s
|
||||
end
|
||||
|
||||
chef_gem 'nokogiri' do
|
||||
version node['xml']['nokogiri']['version']
|
||||
version node['xml']['nokogiri']['version'] if node['xml']['nokogiri']['version']
|
||||
action :install
|
||||
compile_time true if defined? compile_time
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user