Update upstream cookbooks
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
#
|
||||
# Author:: Justin Schuhmann (<jmschu02@gmail.com>)
|
||||
# Cookbook Name:: iis
|
||||
# Cookbook:: iis
|
||||
# Provider:: site
|
||||
#
|
||||
# Copyright:: Justin Schuhmann
|
||||
# Copyright:: 2016, Justin Schuhmann
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -35,7 +35,7 @@ action :add do
|
||||
cmd << " /password:\"#{new_resource.password}\"" if new_resource.password
|
||||
cmd << " /logonMethod:#{new_resource.logon_method}" if new_resource.logon_method
|
||||
cmd << " /allowSubDirConfig:#{new_resource.allow_sub_dir_config}" if new_resource.allow_sub_dir_config
|
||||
cmd << " /commit:\"MACHINE/WEBROOT/APPHOST\""
|
||||
cmd << ' /commit:\"MACHINE/WEBROOT/APPHOST\"'
|
||||
|
||||
Chef::Log.info(cmd)
|
||||
shell_out!(cmd, returns: [0, 42, 183])
|
||||
@@ -130,11 +130,7 @@ def load_current_resource
|
||||
# VDIR "Testfu Site/Content/Test"
|
||||
result = cmd.stdout.match(/^VDIR\s\"#{Regexp.escape(application_identifier)}\"/)
|
||||
Chef::Log.debug("#{new_resource} current_resource match output: #{result}")
|
||||
if result
|
||||
@current_resource.exists = true
|
||||
else
|
||||
@current_resource.exists = false
|
||||
end
|
||||
@current_resource.exists = result
|
||||
else
|
||||
log "Failed to run iis_vdir action :load_current_resource, #{cmd_current_values.stderr}" do
|
||||
level :warn
|
||||
@@ -153,5 +149,7 @@ def application_name_check
|
||||
new_resource.application_name("#{new_resource.application_name}/")
|
||||
elsif new_resource.application_name.chomp('/').include?('/') && new_resource.application_name.end_with?('/')
|
||||
new_resource.application_name(new_resource.application_name.chomp('/'))
|
||||
else
|
||||
new_resource.application_name
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user