Skip to content

Commit

Permalink
Resolves iis_version is not evaluated properly on if statement (#309)
Browse files Browse the repository at this point in the history
Signed-off-by: Justin Schuhmann <jmschu02@gmail.com>
  • Loading branch information
EasyAsABC123 committed Mar 7, 2017
1 parent 12bc7ec commit 5578d11
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

This file is used to list changes made in each version of the iis cookbook.

## 5.0.6 (2017-02-24)
- [iis_version is not evaluated properly on if statement](#308)

## 5.0.5 (2016-11-21)
- [Fixed no_managed_code idempotency](#301)

Expand Down
2 changes: 1 addition & 1 deletion libraries/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def iis_version
version_string.slice! 'Version '
@iis_version = version_string
end
@iis_version
@iis_version.to_f
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache 2.0'
description 'Installs/Configures Microsoft Internet Information Services'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '5.0.5'
version '5.0.6'
supports 'windows'
depends 'windows', '>= 1.34.6'
source_url 'https://github.com/chef-cookbooks/iis'
Expand Down
16 changes: 8 additions & 8 deletions providers/pool.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,11 @@ def configure
is_new_pipeline_mode = new_value?(doc.root, 'APPPOOL/@PipelineMode', new_resource.pipeline_mode)

# add items
if iis_version >= '7.0'
if iis_version >= 7.0
is_new_auto_start = new_value?(doc.root, 'APPPOOL/add/@autoStart', new_resource.auto_start.to_s)
end

if iis_version > '7.0'
if iis_version > 7.0
is_new_start_mode = new_value?(doc.root, 'APPPOOL/add/@startMode', new_resource.start_mode.to_s)
end

Expand All @@ -158,17 +158,17 @@ def configure
# processModel items
is_new_max_processes = new_or_empty_value?(doc.root, 'APPPOOL/add/processModel/@maxProcesses', new_resource.max_proc.to_s)
is_new_load_user_profile = new_value?(doc.root, 'APPPOOL/add/processModel/@loadUserProfile', new_resource.load_user_profile.to_s)
if iis_version > '7.0'
if iis_version > 7.0
is_new_identity_type = new_value?(doc.root, 'APPPOOL/add/processModel/@identityType', new_resource.pool_identity.to_s)
end
is_new_user_name = new_or_empty_value?(doc.root, 'APPPOOL/add/processModel/@userName', new_resource.pool_username.to_s)
is_new_password = new_or_empty_value?(doc.root, 'APPPOOL/add/processModel/@password', new_resource.pool_password.to_s)
if iis_version > '7.0'
if iis_version > 7.0
is_new_logon_type = new_value?(doc.root, 'APPPOOL/add/processModel/@logonType', new_resource.logon_type.to_s)
end
is_new_manual_group_membership = new_value?(doc.root, 'APPPOOL/add/processModel/@manualGroupMembership', new_resource.manual_group_membership.to_s)
is_new_idle_timeout = new_value?(doc.root, 'APPPOOL/add/processModel/@idleTimeout', new_resource.idle_timeout.to_s)
if iis_version >= '8.5'
if iis_version >= 8.5
is_new_idle_timeout_action = new_value?(doc.root, 'APPPOOL/add/processModel/@idleTimeoutAction', new_resource.idle_timeout_action)
end
is_new_shutdown_time_limit = new_value?(doc.root, 'APPPOOL/add/processModel/@shutdownTimeLimit', new_resource.shutdown_time_limit.to_s)
Expand Down Expand Up @@ -209,11 +209,11 @@ def configure
@cmd = "#{appcmd(node)} set config /section:applicationPools"

# root items
if iis_version >= '7.0'
if iis_version >= 7.0
configure_application_pool(is_new_auto_start, "autoStart:#{new_resource.auto_start}")
end

if iis_version >= '7.5'
if iis_version >= 7.5
configure_application_pool(is_new_start_mode, "startMode:#{new_resource.start_mode}")
end

Expand All @@ -232,7 +232,7 @@ def configure
configure_application_pool(is_new_logon_type, "processModel.logonType:#{new_resource.logon_type}")
configure_application_pool(is_new_manual_group_membership, "processModel.manualGroupMembership:#{new_resource.manual_group_membership}")
configure_application_pool(is_new_idle_timeout, "processModel.idleTimeout:#{new_resource.idle_timeout}")
if iis_version >= '8.5'
if iis_version >= 8.5
configure_application_pool(is_new_idle_timeout_action, "processModel.idleTimeoutAction:#{new_resource.idle_timeout_action}")
end
configure_application_pool(is_new_shutdown_time_limit, "processModel.shutdownTimeLimit:#{new_resource.shutdown_time_limit}")
Expand Down

0 comments on commit 5578d11

Please sign in to comment.