Update upstream cookbooks
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
#
|
||||
# Cookbook Name:: iis
|
||||
# Cookbook:: iis
|
||||
# Library:: helper
|
||||
#
|
||||
# Author:: Justin Schuhmann <jmschu02@gmail.com>
|
||||
#
|
||||
# Copyright 2013, Chef Software, Inc.
|
||||
# Copyright:: 2013-2016, 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.
|
||||
@@ -37,21 +37,19 @@ module Opscode
|
||||
cmd << " /enabled:#{default_documents_enabled}"
|
||||
end
|
||||
|
||||
if add || remove
|
||||
default_document.each do |document|
|
||||
if !current_default_documents.include?(document) && add
|
||||
cmd << " /+files.[value='#{document}']"
|
||||
elsif current_default_documents.include?(document) && remove
|
||||
cmd << " /-files.[value='#{document}']"
|
||||
end
|
||||
if add
|
||||
(default_document - current_default_documents).each do |document|
|
||||
cmd << " /+files.[value='#{document}']"
|
||||
end
|
||||
end
|
||||
|
||||
if add && remove
|
||||
current_default_documents.each do |document|
|
||||
unless default_document.include? document
|
||||
cmd << " /-files.[value='#{document}']"
|
||||
end
|
||||
if remove && !add
|
||||
(default_document - current_default_documents).each do |document|
|
||||
cmd << " /-files.[value='#{document}']"
|
||||
end
|
||||
end
|
||||
if remove && add
|
||||
(current_default_documents - default_document).each do |document|
|
||||
cmd << " /-files.[value='#{document}']"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -68,28 +66,25 @@ module Opscode
|
||||
xml = cmd.stdout
|
||||
doc = REXML::Document.new xml
|
||||
current_mime_maps = REXML::XPath.match(doc.root, 'CONFIG/system.webServer-staticContent/mimeMap').map { |x| "fileExtension='#{x.attribute 'fileExtension'}',mimeType='#{x.attribute 'mimeType'}'" }
|
||||
|
||||
cmd = mime_map_command specifier
|
||||
|
||||
if add || remove
|
||||
new_resource_mime_maps.each do |mime_map|
|
||||
if !current_mime_maps.include?(mime_map) && add
|
||||
cmd << " /+\"[#{mime_map}]\""
|
||||
elsif current_mime_maps.include?(mime_map) && remove
|
||||
cmd << " /-\"[#{mime_map}]\""
|
||||
end
|
||||
if add
|
||||
(new_resource_mime_maps - current_mime_maps).each do |mime_map|
|
||||
cmd << " /+\"[#{mime_map}]\""
|
||||
end
|
||||
end
|
||||
if remove && !add
|
||||
(new_resource_mime_maps - current_mime_maps).each do |mime_map|
|
||||
cmd << " /-\"[#{mime_map}]\""
|
||||
end
|
||||
end
|
||||
if remove && add
|
||||
(current_mime_maps - new_resource_mime_maps).each do |mime_map|
|
||||
cmd << " /-\"[#{mime_map}]\""
|
||||
end
|
||||
end
|
||||
|
||||
if add && remove
|
||||
current_mime_maps.each do |mime_map|
|
||||
unless new_resource_mime_maps.include? mime_map
|
||||
cmd << " /-\"[#{mime_map}]\""
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return unless (cmd != mime_map_command(specifier))
|
||||
return unless cmd != mime_map_command(specifier)
|
||||
shell_out! cmd
|
||||
Chef::Log.info('mime maps updated')
|
||||
@was_updated = true
|
||||
|
||||
Reference in New Issue
Block a user