kosmos/chef
8
3
Fork 0
Code Issues 34 Pull Requests 3 Projects 2 Activity

Update the mediawiki cookbook and upstream cookbooks

Browse Source 
Compatibility with Chef 14
This commit is contained in:
Greg Karékinian
2019-04-08 11:20:12 +02:00
parent 6e3e8cde1b
commit 777b85c2ab
312 changed files with 5603 additions and 14219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
cookbooks/php/resources/pear_channel.rb
View File

@@ -4,7 +4,7 @@
# Cookbook:: php
# Resource:: pear_channel
#
# Copyright:: 2011-2017, Chef Software, Inc <legal@chef.io>
# Copyright:: 2011-2018, Chef Software, Inc <legal@chef.io>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
# limitations under the License.
#
property :channel_xml, kind_of: String
property :channel_name, kind_of: String, name_property: true
property :pear, kind_of: String, default: lazy { node['php']['pear'] }
property :channel_xml, String
property :channel_name, String, name_property: true
property :binary, String, default: 'pear'
# TODO: add authenticated channel support!
# property :username, :kind_of => String
# property :password, :kind_of => String
@@ -29,7 +29,7 @@ property :pear, kind_of: String, default: lazy { node['php']['pear'] }
action :discover do
unless exists?
Chef::Log.info("Discovering pear channel #{new_resource}")
execute "#{new_resource.pear} channel-discover #{new_resource.channel_name}" do
execute "#{new_resource.binary} channel-discover #{new_resource.channel_name}" do
action :run
end
end
@@ -38,28 +38,17 @@ end
action :add do
unless exists?
Chef::Log.info("Adding pear channel #{new_resource} from #{new_resource.channel_xml}")
execute "#{new_resource.pear} channel-add #{new_resource.channel_xml}" do
execute "#{new_resource.binary} channel-add #{new_resource.channel_xml}" do
action :run
end
end
end
action :update do
if exists?
update_needed = false
begin
update_needed = true if shell_out("#{new_resource.pear} search -c #{new_resource.channel_name} NNNNNN").stdout =~ /channel-update/
rescue Chef::Exceptions::CommandTimeout
# CentOS can hang on 'pear search' if a channel needs updating
Chef::Log.info("Timed out checking if channel-update needed...forcing update of pear channel #{new_resource}")
update_needed = true
end
if update_needed
description = "update pear channel #{new_resource}"
converge_by(description) do
Chef::Log.info("Updating pear channel #{new_resource}")
shell_out!("#{new_resource.pear} channel-update #{new_resource.channel_name}")
end
if exists? && update_needed?
converge_by("update pear channel #{new_resource}") do
Chef::Log.info("Updating pear channel #{new_resource}")
shell_out!("#{new_resource.binary} channel-update #{new_resource.channel_name}")
end
end
end
@@ -67,15 +56,32 @@ end
action :remove do
if exists?
Chef::Log.info("Deleting pear channel #{new_resource}")
execute "#{new_resource.pear} channel-delete #{new_resource.channel_name}" do
execute "#{new_resource.binary} channel-delete #{new_resource.channel_name}" do
action :run
end
end
end
action_class do
# determine if the channel needs to be updated by searching for a bogus package
# in that channel and looking for the text prompting the user to update the channel
# in the CLI output
# @return [Boolean] does the channel need to be updated
def update_needed?
begin
return true if shell_out("#{new_resource.binary} search -c #{new_resource.channel_name} NNNNNN").stdout =~ /channel-update/
rescue Chef::Exceptions::CommandTimeout
# CentOS can hang on 'pear search' if a channel needs updating
Chef::Log.info("Timed out checking if channel-update needed...forcing update of pear channel #{new_resource.channel_name}")
return true
end
false
end
# run pear channel-info to see if the channel has been setup or not
# @return [Boolean] does the channel exist locally
def exists?
shell_out!("#{new_resource.pear} channel-info #{new_resource.channel_name}")
shell_out!("#{new_resource.binary} channel-info #{new_resource.channel_name}")
true
rescue Mixlib::ShellOut::ShellCommandFailed
false