Update upstream cookbooks
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
#
|
||||
# Author:: Seth Chisamore (<schisamo@chef.io>)
|
||||
# Cookbook Name:: iis
|
||||
# Cookbook:: iis
|
||||
# Provider:: site
|
||||
#
|
||||
# Copyright:: 2011, Chef Software, Inc.
|
||||
# Copyright:: 2011-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.
|
||||
@@ -46,7 +46,7 @@ action :add do
|
||||
configure
|
||||
|
||||
if new_resource.application_pool
|
||||
shell_out!("#{appcmd(node)} set app \"#{new_resource.site_name}/\" /applicationPool:\"#{new_resource.application_pool}\"", returns: [0, 42])
|
||||
shell_out!("#{appcmd(node)} set site /site.name:\"#{new_resource.site_name}\" /[path='/'].applicationPool:\"#{new_resource.application_pool}\"", returns: [0, 42])
|
||||
end
|
||||
new_resource.updated_by_last_action(true)
|
||||
Chef::Log.info("#{new_resource} added new site '#{new_resource.site_name}'")
|
||||
@@ -114,7 +114,7 @@ def load_current_resource
|
||||
@current_resource.site_id(result[2].to_i)
|
||||
@current_resource.exists = true
|
||||
@current_resource.bindings(result[3])
|
||||
@current_resource.running = (result[4] =~ /Started/) ? true : false
|
||||
@current_resource.running = result[4] =~ /Started/ ? true : false
|
||||
else
|
||||
@current_resource.exists = false
|
||||
@current_resource.running = false
|
||||
@@ -140,9 +140,9 @@ def configure
|
||||
is_new_physical_path = new_or_empty_value?(doc.root, 'SITE/site/application/virtualDirectory/@physicalPath', new_resource.path.to_s)
|
||||
is_new_port_host_provided = !"#{XPath.first(doc.root, 'SITE/@bindings')},".include?("#{new_resource.protocol}/*:#{new_resource.port}:#{new_resource.host_header},")
|
||||
is_new_site_id = new_value?(doc.root, 'SITE/site/@id', new_resource.site_id.to_s)
|
||||
is_new_log_directory = new_or_empty_value?(doc.root, 'SITE/logFiles/@directory', new_resource.log_directory.to_s)
|
||||
is_new_log_period = new_or_empty_value?(doc.root, 'SITE/logFile/@period', new_resource.log_period.to_s)
|
||||
is_new_log_trunc = new_or_empty_value?(doc.root, 'SITE/logFiles/@truncateSize', new_resource.log_truncsize.to_s)
|
||||
is_new_log_directory = new_or_empty_value?(doc.root, 'SITE/site/logFile/@directory', new_resource.log_directory.to_s)
|
||||
is_new_log_period = new_or_empty_value?(doc.root, 'SITE/site/logFile/@period', new_resource.log_period.to_s)
|
||||
is_new_log_trunc = new_or_empty_value?(doc.root, 'SITE/site/logFile/@truncateSize', new_resource.log_truncsize.to_s)
|
||||
is_new_application_pool = new_value?(doc.root, 'SITE/site/application/@applicationPool', new_resource.application_pool)
|
||||
|
||||
if new_resource.bindings && is_new_bindings
|
||||
|
||||
Reference in New Issue
Block a user