Update upstream cookbooks

2017-03-20 13:19:10 +00:00
parent bfd2d52ea8
commit bcfd44b923
340 changed files with 12576 additions and 5465 deletions
--- a/cookbooks/iis/.foodcritic
+++ b/cookbooks/iis/.foodcritic
@@ -0,0 +1 @@
+~FC059
--- a/cookbooks/iis/CHANGELOG.md
+++ b/cookbooks/iis/CHANGELOG.md
@@ -1,22 +1,87 @@
 # iis Cookbook CHANGELOG
+
 This file is used to list changes made in each version of the iis cookbook.

+## 5.0.8 (2017-03-13)
+- [iis-root default_documents broke from last fix](#306)
+
+## 5.0.7 (2017-03-07)
+- [iis-root default_documents deleted every chef run](#306)
+
+## 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)
+
+## 5.0.4 (2016-10-11)
+- fixed adding an app pool to a site - This fixes a bug where adding an app pool to a site causes an error. This was using the 'add app' where we are working with a site and the syntax is slightly different according to this [documentation](https://technet.microsoft.com/en-us/library/cc732992%28v=ws.10%29.aspx).
+
+## 5.0.3 (2016-10-10)
+- Log event on recycle - This allows you to specify which events you want to log on recycle. This also changes this so that it defaults to the standard nothing, which means you will need to add this attribute if you are depending on it.
+
+## 5.0.2 (2016-10-07)
+- [Minor over oversight in IIS::mod_aspnet 5.0.1](#296)
+- [IIS Pool resource thirty_two_bit false doesn't](#292)
+
+## 5.0.1 (2016-09-21)
+- Fix mod_management to include dependencies (#293)
+
+## 5.0.0 (2016-09-06)
+- Adding 2k12 version flag to the windows_feature resource (#291)
+- Testing updates
+- Avoid deprecation warnings in the specs
+- Require Chef 12+
+
+## 4.2.0 (2016-08-09)
+- Feature pool recycle virtual memory (#288)
+
+## v4.1.10 (2016-06-29)
+
+- Resolves [Issue with error 50 when installing mod_aspnet](https://github.com/chef-cookbooks/iis/issues/285)
+
+## v4.1.9 (2016-06-26)
+
+- Resolves [Add deprecation warnings for iis_config in 4.2](https://github.com/chef-cookbooks/iis/issues/284)
+- Resolves [iis_pool is not idempotent when recycle_at_time is specified and is not changed](https://github.com/chef-cookbooks/iis/issues/279)
+
+## v4.1.8 (2016-04-15)
+
+- Fixed smp_processor_affinity_mask throwing deprecation warnings
+- Added additional chefspec tests
+- Updated testing dependencies to the latests
+- Disabled FC059 rule for now
+
+## v4.1.7 (2016-03-25)
+
+- Resolves [smp_processor_affinity_mask is wrong value type](https://github.com/chef-cookbooks/iis/issues/266)
+- Resolves [Not a valid unsigned integer](https://github.com/chef-cookbooks/iis/issues/261)
+- Resolves [Deprecated features used](https://github.com/chef-cookbooks/iis/issues/259)
+- Resolves [Deprecated feature used, fix before chef 13](https://github.com/chef-cookbooks/iis/issues/253)
+- Resolves [iis_site :config action not idempotent (Windows 2012 R2/IIS 8.5)](https://github.com/chef-cookbooks/iis/issues/249)
+- Resolves [Can't set recycle_at_time to default](https://github.com/chef-cookbooks/iis/issues/247)
+
 ## v4.1.6 (2016-02-01)
+
 - Resolves issues with [Unable to set app pool to be "No Managed Code"](https://github.com/chef-cookbooks/iis/issues/240)
 - Resolves [Add_mime_maps is throwing compile error](https://github.com/chef-cookbooks/iis/issues/238)
 - Resolves [FATAL: NameError: iis_root "xxx" had an error: NameError: No resource, method, or local variable named `was _updated' for`LWRP provider iis_root from cookbook iis](https://github.com/chef-cookbooks/iis/issues/236)

 ## v4.1.5 (2015-11-18)
+
 - Resolves issues with `iis_root` [#222](https://github.com/chef-cookbooks/iis/issues/222)

 ## v4.1.4 (2015-11-2)
+
 - Re-added functionality for iis_pool auto_start, this was a breaking change

 ## v4.1.3 (2015-10-30)
+
 - Resolves Robucop issues
 - Bug Fix for [#217](https://github.com/chef-cookbooks/iis/issues/217)

 ## v4.1.2 (2015-10-21)
+
 - Bug fixes for application pool provider and site provider
 - Added the ability to detect the IIS Version, allowing for some properties to only exist for specific IIS versions
 - Fixed issue with Win32 being required on linux
@@ -24,6 +89,7 @@ This file is used to list changes made in each version of the iis cookbook.
 - Added iis config set and clear abilities

 ## v4.1.1 (2015-05-07)
+
 - Detects changes in the physical path of apps.
 - Adds support for gMSA identity.
 - Performing add on a site will now reconfigure it if necessary.
@@ -31,6 +97,7 @@ This file is used to list changes made in each version of the iis cookbook.
 - Fix issue where popeline_mode was ignored during configuration of a pool.

 ## v4.1.0 (2015-03-04)
+
 - Removed iis_pool attribute 'set_profile_environment' incompatible with < IIS-8.
 - Added pester test framework.
 - Condensed and fixed change-log to show public releases only.
@@ -38,7 +105,9 @@ This file is used to list changes made in each version of the iis cookbook.
 - Code-cleanup and cosmetic fixes.

 ## v4.0.0 (2015-02-12)
+
 - [#91](https://github.com/chef-cookbooks/iis/pull/91) - bulk addition of new features
+
  - Virtual Directory Support (allows virtual directories to be added to both websites and to webapplications under sites).
  - section unlock and lock support (this is used to allow for the web.config of a site to define the authentication methods).
  - fixed issue with :add on pool provider not running all config (this was a known issue and is now resolved).
@@ -46,9 +115,13 @@ This file is used to list changes made in each version of the iis cookbook.
  - moved to better method for XML checking of previous settings to detect changes (changed all check to use xml searching with appcmd instead of the previous method [none]).

 - Improved pool resource with many more apppool properties that can be set.
+
 - Fixed bug with default attribute inheritance.
+
 - New recipe to enable ASP.NET 4.5.
+
 - Skeleton serverspec+test-kitchen framework.
+
 - Added Berksfile, Gemfile and .kitchen.yml to assist developers.
 - Fixed issue [#107] function is_new_or_empty was returning reverse results.
 - Removed dependency on "chef-client", ">= 3.7.0".
@@ -58,65 +131,89 @@ This file is used to list changes made in each version of the iis cookbook.
 - added backwards compatibility for chef-client < 12.x.x Chef::Util::PathHelper.

 ## v2.1.6 (2014-11-12)
+
 - [#78] Adds new_resource.updated_by_last_action calls

 ## v2.1.5 (2014-09-15)
+
 - [#68] Add win_friendly_path to all appcmd.exe /physicalPath arguments

 ## v2.1.4 (2014-09-13)
+
 - [#72] Adds chefspec matchers
 - [#57] Fixes site_id not being updated on a :config action

 ## v2.1.2 (2014-04-23)
+
 - [COOK-4559] Remove invalid UTF-8 characters

 ## v2.1.0 (2014-03-25)
-[COOK-4426] -  feature order correction for proper installation [COOK-4428] -  Add IIS FTP Feature Installation
+
+[COOK-4426] - feature order correction for proper installation [COOK-4428] - Add IIS FTP Feature Installation

 ## v2.0.4 (2014-03-18)
+
 - [COOK-4420] Corrected incorrect feature names for mod_security

 ## v2.0.2 (2014-02-25)
+
 - [COOK-4108] - Add documentation for the 'bindings' attribute in 'iis_site' LWRP

 ## v2.0.0 (2014-01-03)
+
 Major version bump

 ## v1.6.6
+
 Adding extra windows platform checks to helper library

 ## v1.6.4
+
 ### Bug
+
 - **[COOK-4138](https://tickets.chef.io/browse/COOK-4138)** - iis cookbook won't load on non-Windows platforms

 ## v1.6.2
+
 ### Improvement
+
 - **[COOK-3634](https://tickets.chef.io/browse/COOK-3634)** - provide ability to set app pool managedRuntimeVersion to "No Managed Code"

 ## v1.6.0
+
 ### Improvement
+
 - **[COOK-3922](https://tickets.chef.io/browse/COOK-3922)** - refactor IIS cookbook to not require WebPI

 ## v1.5.6
+
 ### Improvement
+
 - **[COOK-3770](https://tickets.chef.io/browse/COOK-3770)** - Add Enabled Protocols to IIS App Recipe

 ## v1.5.4
+
 ### New Feature
+
 - **[COOK-3675](https://tickets.chef.io/browse/COOK-3675)** - Add recipe for CGI module

 ## v1.5.2
+
 ### Bug
+
 - **[COOK-3232](https://tickets.chef.io/browse/COOK-3232)** - Allow `iis_app` resource `:config` action with a virtual path

 ## v1.5.0
+
 ### Improvement
+
 - [COOK-2370]: add MVC2, escape `application_pool` and add options for
 - recycling
 - [COOK-2694]: update iis documentation to show that Windows 2012 and
 - Windows 8 are supported

 ### Bug
+
 - [COOK-2325]: `load_current_resource` does not load state of pool
 - correctly, always sets running to false
 - [COOK-2526]: Installing IIS after .NET framework will leave
@@ -125,25 +222,31 @@ Adding extra windows platform checks to helper library
 - not accepted

 ## v1.4.0
+
 - [COOK-2181] -Adding full module support to iis cookbook

 ## v1.3.6
+
 - [COOK-2084] - Add support for additional options during site creation
 - [COOK-2152] - Add recipe for IIS6 metabase compatibility

 ## v1.3.4
+
 - [COOK-2050] - IIS cookbook does not have returns resource defined

 ## v1.3.2
+
 - [COOK-1251] - Fix LWRP "NotImplementedError"

 ## v1.3.0
+
 - [COOK-1301] - Add a recycle action to the iis_pool resource
 - [COOK-1665] - app pool identity and new node[iis][component] attribute
 - [COOK-1666] - Recipe to remove default site and app pool
 - [COOK-1858] - Recipe misspelled

 ## v1.2.0
+
 - [COOK-1061] - `iis_site` doesn't allow setting the pool
 - [COOK-1078] - handle advanced bindings
 - [COOK-1283] - typo on pool
@@ -154,6 +257,7 @@ Adding extra windows platform checks to helper library
 - [COOK-1647] - mod_ApplicationInitialization isn't RC

 ## v1.1.0
+
 - [COOK-1012] - support adding apps
 - [COOK-1028] - support for config command
 - [COOK-1041] - fix removal in app pools
@@ -161,8 +265,10 @@ Adding extra windows platform checks to helper library
 - [COOK-950] - documentation correction for version of IIS/OS

 ## v1.0.2
+
 - Ruby 1.9 compat fixes
 - ensure carriage returns are removed before applying regex

 ## v1.0.0
+
 - [COOK-718] initial release
--- a/cookbooks/iis/MAINTAINERS.md
+++ b/cookbooks/iis/MAINTAINERS.md
@@ -1,25 +1,20 @@
 <!-- This is a generated file. Please do not edit directly -->

 # Maintainers
-This file lists how this cookbook project is maintained. When making changes to the system, this
-file tells you who needs to review your patch - you need a simple majority of maintainers
-for the relevant subsystems to provide a :+1: on your pull request. Additionally, you need
-to not receive a veto from a Lieutenant or the Project Lead.
+This file lists how this cookbook project is maintained. When making changes to the system, this file tells you who needs to review your patch - you need a review from an existing maintainer for the cookbook to provide a :+1: on your pull request. Additionally, you need to not receive a veto from a Lieutenant or the Project Lead.

-Check out [How Cookbooks are Maintained](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD) 
-for details on the process and how to become a maintainer or the project lead.
+Check out [How Cookbooks are Maintained](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD) for details on the process and how to become a maintainer or the project lead.

 # Project Maintainer
 * [Adam Edwards](https://github.com/adamedx)

 # Maintainers
-* [Adam Edwards](https://github.com/adamedx)
-* [Kartik Null Cating-Subramanian](https://github.com/ksubrama)
-* [Steven Murawski](https://github.com/smurawski)
-* [Matt Wrock](https://github.com/mwrock)
-* [Jay Mundrawala](https://github.com/jaym)
-* [Claire McQuin](https://github.com/mcquin)
 * [Salim Alam](https://github.com/chefsalim)
-* [Sean OMeara](https://github.com/someara)
-* [Tim Smith](https://github.com/tas50)
 * [Jennifer Davis](https://github.com/sigje)
+* [Adam Edwards](https://github.com/adamedx)
+* [Claire McQuin](https://github.com/mcquin)
+* [Steven Murawski](https://github.com/smurawski)
+* [Kartik Null Cating-Subramanian](https://github.com/ksubrama)
+* [Justin Schuhmann](https://github.com/EasyAsABC123)
+* [Tim Smith](https://github.com/tas50)
+* [Matt Wrock](https://github.com/mwrock)
--- a/cookbooks/iis/README.md
+++ b/cookbooks/iis/README.md
--- a/cookbooks/iis/attributes/default.rb
+++ b/cookbooks/iis/attributes/default.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Attribute:: default
 #
-# Copyright:: Copyright (c) 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.
@@ -27,3 +27,5 @@ default['iis']['cache_dir']  = "#{ENV['SYSTEMDRIVE']}\\inetpub\\temp"
 default['iis']['components'] = []

 default['iis']['source'] = nil
+
+default['iis']['recycle']['log_events'] = 'Time, Requests, Schedule, Memory, IsapiUnhealthy, OnDemand, ConfigChange, PrivateMemory'
--- a/cookbooks/iis/libraries/helper.rb
+++ b/cookbooks/iis/libraries/helper.rb
@@ -1,11 +1,11 @@
 #
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Library:: helper
 #
 # Author:: Julian C. Dunn <jdunn@chef.io>
 # 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.
@@ -67,11 +67,11 @@ module Opscode
      end

      def windows_cleanpath(path)
-        if !defined?(Chef::Util::PathHelper.cleanpath).nil?
-          path = Chef::Util::PathHelper.cleanpath(path)
-        else
-          path = win_friendly_path(path)
-        end
+        path = if defined?(Chef::Util::PathHelper.cleanpath).nil?
+                 win_friendly_path(path)
+               else
+                 Chef::Util::PathHelper.cleanpath(path)
+               end
        # Remove any trailing slashes to prevent them from accidentally escaping any quotes.
        path.chomp('/').chomp('\\')
      end
@@ -96,7 +96,7 @@ module Opscode
          version_string.slice! 'Version '
          @iis_version = version_string
        end
-        @iis_version
+        @iis_version.to_f
      end
    end
  end
--- a/cookbooks/iis/libraries/matcher.rb
+++ b/cookbooks/iis/libraries/matcher.rb
@@ -1,7 +1,10 @@
 if defined?(ChefSpec)

-  def config_iis_config(command)
-    ChefSpec::Matchers::ResourceMatcher.new(:iis_config, :config, command)
+  [:set, :clear, :config].each do |action|
+    self.class.send(:define_method, "#{action}_iis_config", proc do |config_name|
+      ChefSpec::Matchers::ResourceMatcher.new(:iis_config, action, config_name)
+    end
+                   )
  end

  [:config, :add, :delete].each do |action|
@@ -53,11 +56,11 @@ if defined?(ChefSpec)
                   )
  end

-  if Gem.loaded_specs['chefspec'].version < Gem::Version.new('4.1.0')
-    define_method = ChefSpec::Runner.method(:define_runner_method)
-  else
-    define_method = ChefSpec.method(:define_matcher)
-  end
+  define_method = if Gem.loaded_specs['chefspec'].version < Gem::Version.new('4.1.0')
+                    ChefSpec::Runner.method(:define_runner_method)
+                  else
+                    ChefSpec.method(:define_matcher)
+                  end

  define_method.call :iis_app
  define_method.call :iis_config
--- a/cookbooks/iis/libraries/processors.rb
+++ b/cookbooks/iis/libraries/processors.rb
@@ -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
--- a/cookbooks/iis/metadata.json
+++ b/cookbooks/iis/metadata.json
--- a/cookbooks/iis/providers/app.rb
+++ b/cookbooks/iis/providers/app.rb
@@ -1,10 +1,10 @@
 #
 # Author:: Kendrick Martin (kendrick.martin@webtrends.com)
 # Contributor:: Adam Wayne (awayne@waynedigital.com)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Provider:: app
 #
-# Copyright:: 2011, Webtrends Inc.
+# Copyright:: 2011-2016, Webtrends Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ action :add do
    cmd << " /applicationPool:\"#{new_resource.application_pool}\"" if new_resource.application_pool
    cmd << " /physicalPath:\"#{windows_cleanpath(new_resource.physical_path)}\"" if new_resource.physical_path
    cmd << " /enabledProtocols:\"#{new_resource.enabled_protocols}\"" if new_resource.enabled_protocols
-    cmd << " /commit:\"MACHINE/WEBROOT/APPHOST\""
+    cmd << ' /commit:\"MACHINE/WEBROOT/APPHOST\"'
    Chef::Log.debug(cmd)
    shell_out!(cmd)
    new_resource.updated_by_last_action(true)
@@ -124,11 +124,7 @@ def load_current_resource
  if cmd.stderr.empty?
    result = cmd.stdout.match(regex)
    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_app action :load_current_resource, #{cmd_current_values.stderr}" do
      level :warn
--- a/cookbooks/iis/providers/config.rb
+++ b/cookbooks/iis/providers/config.rb
@@ -1,10 +1,10 @@
 #
 # Author:: Kendrick Martin (kendrick.martin@webtrends.com)
 # Contributor:: David Dvorak (david.dvorak@webtrends.com)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: config
 #
-# Copyright:: 2011, Webtrends Inc.
+# Copyright:: 2011-2016, Webtrends Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,15 +27,19 @@ include Opscode::IIS::Processors

 # :config deprecated, use :set instead
 action :config do
-  config
+  Chef::Log.warn <<-eos
+    Use of action `:config` in resource `iis_config` is now deprecated and will be removed in a future release (v4.2.0).
+    `:set` should be used instead.
+    eos
+  new_resource.updated_by_last_action(true) if config
 end

 action :set do
-  config
+  new_resource.updated_by_last_action(true) if config
 end

 action :clear do
-  config(:clear)
+  new_resource.updated_by_last_action(true) if config(:clear)
 end

 def config(action = :set)
--- a/cookbooks/iis/providers/module.rb
+++ b/cookbooks/iis/providers/module.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Jon DeCamp (<jon.decamp@nordstrom.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Provider:: site
 #
-# Copyright:: 2013, Nordstrom, Inc.
+# Copyright:: 2013-2016, Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -79,6 +79,7 @@ action :install do
      cmd = "#{appcmd(node)} install module /name:\"#{new_resource.module_name}\""
      cmd << " /add:\"#{new_resource.add}\"" unless new_resource.add.nil?
      cmd << " /image:\"#{new_resource.image}\"" if new_resource.image
+      cmd << " /preCondition:\"#{new_resource.precondition}\"" if new_resource.precondition

      shell_out!(cmd, returns: [0, 42])

@@ -108,19 +109,15 @@ end
 def load_current_resource
  @current_resource = Chef::Resource::IisModule.new(new_resource.name)
  @current_resource.module_name(new_resource.module_name)
-  if new_resource.application
-    cmd = shell_out("#{appcmd(node)} list module /module.name:\"#{new_resource.module_name}\" /app.name:\"#{new_resource.application}\"")
-  else
-    cmd = shell_out("#{appcmd(node)} list module /module.name:\"#{new_resource.module_name}\"")
-  end
+  cmd = if new_resource.application
+          shell_out("#{appcmd(node)} list module /module.name:\"#{new_resource.module_name}\" /app.name:\"#{new_resource.application}\"")
+        else
+          shell_out("#{appcmd(node)} list module /module.name:\"#{new_resource.module_name}\"")
+        end

  # 'MODULE "Module Name" ( type:module.type, preCondition:condition )'
  # 'MODULE "Module Name" ( native, preCondition:condition )'

  Chef::Log.debug("#{new_resource} list module command output: #{cmd.stdout}")
-  if cmd.stdout.empty?
-    @current_resource.exists = false
-  else
-    @current_resource.exists = true
-  end
+  @current_resource.exists = !cmd.stdout.empty?
 end
--- a/cookbooks/iis/providers/pool.rb
+++ b/cookbooks/iis/providers/pool.rb
@@ -1,10 +1,10 @@
 #
 # Author:: Kendrick Martin (kendrick.martin@webtrends.com)
 # Contributor:: David Dvorak (david.dvorak@webtrends.com)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Provider:: pool
 #
-# Copyright:: 2011, Webtrends Inc.
+# Copyright:: 2011-2016, Webtrends Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,11 +32,11 @@ action :add do
    cmd = "#{appcmd(node)} add apppool /name:\"#{new_resource.pool_name}\""
    if new_resource.no_managed_code
      cmd << ' /managedRuntimeVersion:'
-    else
-      cmd << " /managedRuntimeVersion:v#{new_resource.runtime_version}" if new_resource.runtime_version
+    elsif new_resource.runtime_version
+      cmd << " /managedRuntimeVersion:v#{new_resource.runtime_version}"
    end
    cmd << " /managedPipelineMode:#{new_resource.pipeline_mode.capitalize}" if new_resource.pipeline_mode
-    cmd << " /commit:\"MACHINE/WEBROOT/APPHOST\""
+    cmd << ' /commit:\"MACHINE/WEBROOT/APPHOST\"'
    Chef::Log.debug(cmd)
    shell_out!(cmd)
    configure
@@ -107,7 +107,7 @@ def load_current_resource
    Chef::Log.debug("#{new_resource} current_resource match output: #{result}")
    if result
      @current_resource.exists = true
-      @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
@@ -135,15 +135,20 @@ def configure
    doc = Document.new(xml)

    # root items
-    is_new_managed_runtime_version = new_value?(doc.root, 'APPPOOL/@RuntimeVersion', "v#{new_resource.runtime_version}")
+    is_new_managed_runtime_version =
+      if new_resource.no_managed_code
+        new_value?(doc.root, 'APPPOOL/@RuntimeVersion', '')
+      else
+        new_value?(doc.root, 'APPPOOL/@RuntimeVersion', "v#{new_resource.runtime_version}")
+      end
    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

@@ -153,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)
@@ -189,25 +194,26 @@ def configure
    is_new_recycle_after_time = new_or_empty_value?(doc.root, 'APPPOOL/add/recycling/periodicRestart/@time', new_resource.recycle_after_time.to_s)
    is_new_recycle_at_time = new_or_empty_value?(doc.root, "APPPOOL/add/recycling/periodicRestart/schedule/add[@value='#{new_resource.recycle_at_time}']/@value", new_resource.recycle_at_time.to_s)
    is_new_private_memory = new_or_empty_value?(doc.root, 'APPPOOL/add/recycling/periodicRestart/@privateMemory', new_resource.private_mem.to_s)
-    is_new_log_event_on_recycle = new_value?(doc.root, 'APPPOOL/add/recycling/@logEventOnRecycle', 'Time, Requests, Schedule, Memory, IsapiUnhealthy, OnDemand, ConfigChange, PrivateMemory')
+    is_new_virtual_memory = new_or_empty_value?(doc.root, 'APPPOOL/add/recycling/periodicRestart/@memory', new_resource.virtual_mem.to_s)
+    is_new_log_event_on_recycle = new_or_empty_value?(doc.root, 'APPPOOL/add/recycling/@logEventOnRecycle', new_resource.log_event_on_recycle.to_s)

    # cpu items
    is_new_cpu_action = new_value?(doc.root, 'APPPOOL/add/cpu/@action', new_resource.cpu_action.to_s)
    is_new_cpu_limit = new_value?(doc.root, 'APPPOOL/add/cpu/@limit', new_resource.cpu_limit.to_s)
    is_new_cpu_smp_affinitized = new_value?(doc.root, 'APPPOOL/add/cpu/@smpAffinitized', new_resource.cpu_smp_affinitized.to_s)
    is_new_cpu_reset_interval = new_value?(doc.root, 'APPPOOL/add/cpu/@resetInterval', new_resource.cpu_reset_interval.to_s)
-    is_new_smp_processor_affinity_mask = new_value?(doc.root, 'APPPOOL/add/cpu/@smpProcessorAffinityMask', new_resource.smp_processor_affinity_mask.to_s)
-    is_new_smp_processor_affinity_mask_2 = new_value?(doc.root, 'APPPOOL/add/cpu/@smpProcessorAffinityMask2', new_resource.smp_processor_affinity_mask_2.to_s)
+    is_new_smp_processor_affinity_mask = new_value?(doc.root, 'APPPOOL/add/cpu/@smpProcessorAffinityMask', new_resource.smp_processor_affinity_mask.floor)
+    is_new_smp_processor_affinity_mask_2 = new_value?(doc.root, 'APPPOOL/add/cpu/@smpProcessorAffinityMask2', new_resource.smp_processor_affinity_mask_2.floor)

    # Application Pool Config
    @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

@@ -217,7 +223,7 @@ def configure
      configure_application_pool(new_resource.runtime_version && is_new_managed_runtime_version, "managedRuntimeVersion:v#{new_resource.runtime_version}")
    end
    configure_application_pool(new_resource.pipeline_mode && is_new_pipeline_mode, "managedPipelineMode:#{new_resource.pipeline_mode}")
-    configure_application_pool(new_resource.thirty_two_bit && is_new_enable_32_bit_app_on_win_64, "enable32BitAppOnWin64:#{new_resource.thirty_two_bit}")
+    configure_application_pool(is_new_enable_32_bit_app_on_win_64, "enable32BitAppOnWin64:#{new_resource.thirty_two_bit}")
    configure_application_pool(new_resource.queue_length && is_new_queue_length, "queueLength:#{new_resource.queue_length}")

    # processModel items
@@ -226,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}")
@@ -236,7 +242,7 @@ def configure
    configure_application_pool(is_new_ping_response_time, "processModel.pingResponseTime:#{new_resource.ping_response_time}")

    node_array = XPath.match(doc.root, 'APPPOOL/add/recycling/periodicRestart/schedule/add')
-    should_clear_apppool_schedules = (new_resource.recycle_at_time && is_new_recycle_at_time) || node_array.length > 1
+    should_clear_apppool_schedules = ((new_resource.recycle_at_time && is_new_recycle_at_time) && !node_array.empty?) || (new_resource.recycle_schedule_clear && !node_array.empty?)

    # recycling items
    ## Special case this collection removal for now.
@@ -250,8 +256,9 @@ def configure

    configure_application_pool(new_resource.recycle_after_time && is_new_recycle_after_time, "recycling.periodicRestart.time:#{new_resource.recycle_after_time}")
    configure_application_pool(new_resource.recycle_at_time && is_new_recycle_at_time, "recycling.periodicRestart.schedule.[value='#{new_resource.recycle_at_time}']", '+')
-    configure_application_pool(is_new_log_event_on_recycle, 'recycling.logEventOnRecycle:PrivateMemory,Memory,Schedule,Requests,Time,ConfigChange,OnDemand,IsapiUnhealthy')
+    configure_application_pool(new_resource.log_event_on_recycle && is_new_log_event_on_recycle, "recycling.logEventOnRecycle:#{new_resource.log_event_on_recycle}")
    configure_application_pool(new_resource.private_mem && is_new_private_memory, "recycling.periodicRestart.privateMemory:#{new_resource.private_mem}")
+    configure_application_pool(new_resource.virtual_mem && is_new_virtual_memory, "recycling.periodicRestart.memory:#{new_resource.virtual_mem}")
    configure_application_pool(is_new_disallow_rotation_on_config_change, "recycling.disallowRotationOnConfigChange:#{new_resource.disallow_rotation_on_config_change}")
    configure_application_pool(is_new_disallow_overlapping_rotation, "recycling.disallowOverlappingRotation:#{new_resource.disallow_overlapping_rotation}")

@@ -271,10 +278,10 @@ def configure
    configure_application_pool(is_new_cpu_limit, "cpu.limit:#{new_resource.cpu_limit}")
    configure_application_pool(is_new_cpu_reset_interval, "cpu.resetInterval:#{new_resource.cpu_reset_interval}")
    configure_application_pool(is_new_cpu_smp_affinitized, "cpu.smpAffinitized:#{new_resource.cpu_smp_affinitized}")
-    configure_application_pool(is_new_smp_processor_affinity_mask, "cpu.smpProcessorAffinityMask:#{new_resource.smp_processor_affinity_mask}")
-    configure_application_pool(is_new_smp_processor_affinity_mask_2, "cpu.smpProcessorAffinityMask2:#{new_resource.smp_processor_affinity_mask_2}")
+    configure_application_pool(is_new_smp_processor_affinity_mask, "cpu.smpProcessorAffinityMask:#{new_resource.smp_processor_affinity_mask.floor}")
+    configure_application_pool(is_new_smp_processor_affinity_mask_2, "cpu.smpProcessorAffinityMask2:#{new_resource.smp_processor_affinity_mask_2.floor}")

-    if (@cmd != "#{appcmd(node)} set config /section:applicationPools")
+    if @cmd != "#{appcmd(node)} set config /section:applicationPools"
      Chef::Log.debug(@cmd)
      shell_out!(@cmd)
    end
--- a/cookbooks/iis/providers/root.rb
+++ b/cookbooks/iis/providers/root.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Justin Schuhmann (<jmschu02@gmail.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Provider:: root
 #
-# 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.
--- a/cookbooks/iis/providers/section.rb
+++ b/cookbooks/iis/providers/section.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Justin Schuhmann
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: lock
 #
-# 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.
--- a/cookbooks/iis/providers/site.rb
+++ b/cookbooks/iis/providers/site.rb
@@ -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
--- a/cookbooks/iis/providers/vdir.rb
+++ b/cookbooks/iis/providers/vdir.rb
@@ -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
--- a/cookbooks/iis/recipes/default.rb
+++ b/cookbooks/iis/recipes/default.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: default
 #
-# 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.
@@ -21,7 +21,7 @@
 # Always add this, so that we don't require this to be added if we want to add other components
 default = Opscode::IIS::Helper.older_than_windows2008r2? ? 'Web-Server' : 'IIS-WebServerRole'

-(node['iis']['components'] + [default]).each do |feature|
+([default] + node['iis']['components']).each do |feature|
  windows_feature feature do
    action :install
    all !Opscode::IIS::Helper.older_than_windows2012?
--- a/cookbooks/iis/recipes/mod_application_initialization.rb
+++ b/cookbooks/iis/recipes/mod_application_initialization.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_application_initialization
 #
-# 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.
--- a/cookbooks/iis/recipes/mod_aspnet.rb
+++ b/cookbooks/iis/recipes/mod_aspnet.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_aspnet
 #
-# 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.
@@ -21,14 +21,16 @@
 include_recipe 'iis'
 include_recipe 'iis::mod_isapi'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  features = %w(NET-Framework)
-else
-  features = %w(IIS-NetFxExtensibility IIS-ASPNET)
-end
+features = if Opscode::IIS::Helper.older_than_windows2008r2?
+             %w(NET-Framework)
+           else
+             %w(IIS-NetFxExtensibility IIS-ASPNET)
+           end

 features.each do |feature|
  windows_feature feature do
    action :install
+    all !Opscode::IIS::Helper.older_than_windows2012?
+    source node['iis']['source'] unless node['iis']['source'].nil?
  end
 end
--- a/cookbooks/iis/recipes/mod_aspnet45.rb
+++ b/cookbooks/iis/recipes/mod_aspnet45.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Blair Hamilton (<blairham@me.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_aspnet45
 #
-# 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.
@@ -21,11 +21,11 @@
 include_recipe 'iis'
 include_recipe 'iis::mod_isapi'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  features = %w(NET-Framework)
-else
-  features = %w(NetFx4Extended-ASPNET45 IIS-NetFxExtensibility45 IIS-ASPNET45)
-end
+features = if Opscode::IIS::Helper.older_than_windows2008r2?
+             %w(NET-Framework)
+           else
+             %w(NetFx4Extended-ASPNET45 IIS-NetFxExtensibility45 IIS-ASPNET45)
+           end

 features.each do |feature|
  windows_feature feature do
--- a/cookbooks/iis/recipes/mod_auth_anonymous.rb
+++ b/cookbooks/iis/recipes/mod_auth_anonymous.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Justin Schuhmann
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_auth_basic
 #
-# 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.
--- a/cookbooks/iis/recipes/mod_auth_basic.rb
+++ b/cookbooks/iis/recipes/mod_auth_basic.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_auth_basic
 #
-# Copyright:: Copyright (c) 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.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  feature = 'Web-Basic-Auth'
-else
-  feature = 'IIS-BasicAuthentication'
-end
+feature = if Opscode::IIS::Helper.older_than_windows2008r2?
+            'Web-Basic-Auth'
+          else
+            'IIS-BasicAuthentication'
+          end

 windows_feature feature do
  action :install
--- a/cookbooks/iis/recipes/mod_auth_digest.rb
+++ b/cookbooks/iis/recipes/mod_auth_digest.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Justin Schuhmann
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_auth_basic
 #
-# 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.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  feature = 'Web-Digest-Auth'
-else
-  feature = 'IIS-DigestAuthentication'
-end
+feature = if Opscode::IIS::Helper.older_than_windows2008r2?
+            'Web-Digest-Auth'
+          else
+            'IIS-DigestAuthentication'
+          end

 windows_feature feature do
  action :install
--- a/cookbooks/iis/recipes/mod_auth_windows.rb
+++ b/cookbooks/iis/recipes/mod_auth_windows.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_auth_windows
 #
-# 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.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  feature = 'Web-Windows-Auth'
-else
-  feature = 'IIS-WindowsAuthentication'
-end
+feature = if Opscode::IIS::Helper.older_than_windows2008r2?
+            'Web-Windows-Auth'
+          else
+            'IIS-WindowsAuthentication'
+          end

 windows_feature feature do
  action :install
--- a/cookbooks/iis/recipes/mod_cgi.rb
+++ b/cookbooks/iis/recipes/mod_cgi.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Richard Downer (<richard.downer@cloudsoftcorp.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_cgi
 #
-# Copyright 2013, Cloudsoft Corporation
+# Copyright:: 2013-2016, Cloudsoft Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  feature = 'Web-CGI'
-else
-  feature = 'IIS-CGI'
-end
+feature = if Opscode::IIS::Helper.older_than_windows2008r2?
+            'Web-CGI'
+          else
+            'IIS-CGI'
+          end

 windows_feature feature do
  action :install
--- a/cookbooks/iis/recipes/mod_compress_dynamic.rb
+++ b/cookbooks/iis/recipes/mod_compress_dynamic.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_compress_dynamic
 #
-# 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.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  feature = 'Web-Dyn-Compression'
-else
-  feature = 'IIS-HttpCompressionDynamic'
-end
+feature = if Opscode::IIS::Helper.older_than_windows2008r2?
+            'Web-Dyn-Compression'
+          else
+            'IIS-HttpCompressionDynamic'
+          end

 windows_feature feature do
  action :install
--- a/cookbooks/iis/recipes/mod_compress_static.rb
+++ b/cookbooks/iis/recipes/mod_compress_static.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_compress_static
 #
-# 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.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  feature = 'Web-Stat-Compression'
-else
-  feature = 'IIS-HttpCompressionStatic'
-end
+feature = if Opscode::IIS::Helper.older_than_windows2008r2?
+            'Web-Stat-Compression'
+          else
+            'IIS-HttpCompressionStatic'
+          end

 windows_feature feature do
  action :install
--- a/cookbooks/iis/recipes/mod_ftp.rb
+++ b/cookbooks/iis/recipes/mod_ftp.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Kevin Rivers (<kevin@kevinrivers.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_ftp
 #
-# Copyright 2014, Kevin Rivers
+# Copyright:: 2014-2016, Kevin Rivers
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  features = %w(Web-Ftp-Server Web-Ftp-Service Web-Ftp-Ext)
-else
-  features = %w(IIS-FTPServer IIS-FTPSvc IIS-FTPExtensibility)
-end
+features = if Opscode::IIS::Helper.older_than_windows2008r2?
+             %w(Web-Ftp-Server Web-Ftp-Service Web-Ftp-Ext)
+           else
+             %w(IIS-FTPServer IIS-FTPSvc IIS-FTPExtensibility)
+           end

 features.each do |f|
  windows_feature f do
--- a/cookbooks/iis/recipes/mod_iis6_metabase_compat.rb
+++ b/cookbooks/iis/recipes/mod_iis6_metabase_compat.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Kristian Vlaardingerbroek (<kvlaardingerbroek@schubergphilis.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_iis6_metabase_compat
 #
-# Copyright 2013, Schuberg Philis B.V.
+# Copyright:: 2013-2016, Schuberg Philis B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  features = %w(Web-Mgmt-Compat Web-Metabase)
-else
-  features = %w(IIS-IIS6ManagementCompatibility IIS-Metabase)
-end
+features = if Opscode::IIS::Helper.older_than_windows2008r2?
+             %w(Web-Mgmt-Compat Web-Metabase)
+           else
+             %w(IIS-IIS6ManagementCompatibility IIS-Metabase)
+           end

 features.each do |f|
  windows_feature f do
--- a/cookbooks/iis/recipes/mod_isapi.rb
+++ b/cookbooks/iis/recipes/mod_isapi.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_isapi
 #
-# 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.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  features = %w(Web-ISAPI-Filter Web-ISAPI-Ext)
-else
-  features = %w(IIS-ISAPIFilter IIS-ISAPIExtensions)
-end
+features = if Opscode::IIS::Helper.older_than_windows2008r2?
+             %w(Web-ISAPI-Filter Web-ISAPI-Ext)
+           else
+             %w(IIS-ISAPIFilter IIS-ISAPIExtensions)
+           end

 features.each do |feature|
  windows_feature feature do
--- a/cookbooks/iis/recipes/mod_logging.rb
+++ b/cookbooks/iis/recipes/mod_logging.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_logging
 #
-# 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.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  feature = 'Web-Http-Logging'
-else
-  feature = 'IIS-CustomLogging'
-end
+feature = if Opscode::IIS::Helper.older_than_windows2008r2?
+            'Web-Http-Logging'
+          else
+            'IIS-CustomLogging'
+          end

 windows_feature feature do
  action :install
--- a/cookbooks/iis/recipes/mod_management.rb
+++ b/cookbooks/iis/recipes/mod_management.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_management
 #
-# 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.
@@ -20,14 +20,15 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  features = %w(Web-Mgmt-Console Web-Mgmt-Service)
-else
-  features = %w(IIS-ManagementConsole IIS-ManagementService)
-end
+features = if Opscode::IIS::Helper.older_than_windows2008r2?
+             %w(Web-Mgmt-Console Web-Mgmt-Service)
+           else
+             %w(IIS-ManagementConsole IIS-ManagementService)
+           end

 features.each do |feature|
  windows_feature feature do
    action :install
+    all !Opscode::IIS::Helper.older_than_windows2012?
  end
 end
--- a/cookbooks/iis/recipes/mod_security.rb
+++ b/cookbooks/iis/recipes/mod_security.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_security
 #
-# 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.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  features = %w(Web-Url-Auth Web-Filtering Web-IP-Security)
-else
-  features = %w(IIS-URLAuthorization IIS-RequestFiltering IIS-IPSecurity)
-end
+features = if Opscode::IIS::Helper.older_than_windows2008r2?
+             %w(Web-Url-Auth Web-Filtering Web-IP-Security)
+           else
+             %w(IIS-URLAuthorization IIS-RequestFiltering IIS-IPSecurity)
+           end

 features.each do |feature|
  windows_feature feature do
--- a/cookbooks/iis/recipes/mod_tracing.rb
+++ b/cookbooks/iis/recipes/mod_tracing.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: mod_diagnostics
 #
-# 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.
@@ -20,11 +20,11 @@

 include_recipe 'iis'

-if Opscode::IIS::Helper.older_than_windows2008r2?
-  feature = 'Web-Http-Tracing'
-else
-  feature = 'IIS-HTTPTracing'
-end
+feature = if Opscode::IIS::Helper.older_than_windows2008r2?
+            'Web-Http-Tracing'
+          else
+            'IIS-HTTPTracing'
+          end

 windows_feature feature do
  action :install
--- a/cookbooks/iis/recipes/remove_default_site.rb
+++ b/cookbooks/iis/recipes/remove_default_site.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Kendrick Martin (<kendrick.martin@webtrends.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Recipe:: remove_default_site
 #
-# Copyright 2012, Webtrends, Inc.
+# Copyright:: 2012-2016, Webtrends, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/iis/resources/app.rb
+++ b/cookbooks/iis/resources/app.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Kendrick Martin (kendrick.martin@webtrends.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: app
 #
-# Copyright:: 2011, Webtrends Inc.
+# Copyright:: 2011-2016, Webtrends Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/iis/resources/config.rb
+++ b/cookbooks/iis/resources/config.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Kendrick Martin (kendrick.martin@webtrends.com)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: config
 #
-# Copyright:: 2011, Webtrends Inc.
+# Copyright:: 2011-2016, Webtrends Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/iis/resources/module.rb
+++ b/cookbooks/iis/resources/module.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Jon DeCamp (<jon.decamp@nordstrom.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: module
 #
-# Copyright:: 2012, Nordstrom, Inc.
+# Copyright:: 2012-2016, Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/iis/resources/pool.rb
+++ b/cookbooks/iis/resources/pool.rb
@@ -1,10 +1,10 @@
 #
 # Author:: Kendrick Martin (kendrick.martin@webtrends.com>)
 # Contributor:: David Dvorak (david.dvorak@webtrends.com)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: pool
 #
-# Copyright:: 2011, Webtrends Inc.
+# Copyright:: 2011-2016, Webtrends Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,9 +53,12 @@ attribute :ping_response_time, kind_of: String, default: '00:01:30'
 # recycling items
 attribute :disallow_rotation_on_config_change, kind_of: [TrueClass, FalseClass], default: false
 attribute :disallow_overlapping_rotation, kind_of: [TrueClass, FalseClass], default: false
+attribute :recycle_schedule_clear, kind_of: [TrueClass, FalseClass], default: false
+attribute :log_event_on_recycle, kind_of: String, default: node['iis']['recycle']['log_events']
 attribute :recycle_after_time, kind_of: String
 attribute :recycle_at_time, kind_of: String
 attribute :private_mem, kind_of: Integer
+attribute :virtual_mem, kind_of: Integer

 # failure items
 attribute :load_balancer_capabilities, kind_of: Symbol, equal_to: [:HttpLevel, :TcpLevel], default: :HttpLevel
@@ -73,7 +76,7 @@ attribute :cpu_action, kind_of: Symbol, equal_to: [:NoAction, :KillW3wp, :Thrott
 attribute :cpu_limit, kind_of: Integer, default: 0
 attribute :cpu_reset_interval, kind_of: String, default: '00:05:00'
 attribute :cpu_smp_affinitized, kind_of: [TrueClass, FalseClass], default: false
-attribute :smp_processor_affinity_mask, kind_of: Bignum, default: 4_294_967_295
-attribute :smp_processor_affinity_mask_2, kind_of: Bignum, default: 4_294_967_295
+attribute :smp_processor_affinity_mask, kind_of: Float, default: 4_294_967_295.0
+attribute :smp_processor_affinity_mask_2, kind_of: Float, default: 4_294_967_295.0

 attr_accessor :exists, :running
--- a/cookbooks/iis/resources/root.rb
+++ b/cookbooks/iis/resources/root.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Justin Schuhmann (<jmschu02@gmail.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: root
 #
-# 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.
--- a/cookbooks/iis/resources/section.rb
+++ b/cookbooks/iis/resources/section.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Justin Schuhmann
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: lock
 #
-# 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.
--- a/cookbooks/iis/resources/site.rb
+++ b/cookbooks/iis/resources/site.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: 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.
--- a/cookbooks/iis/resources/vdir.rb
+++ b/cookbooks/iis/resources/vdir.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Justin Schuhmann (<jmschu02@gmail.com>)
-# Cookbook Name:: iis
+# Cookbook:: iis
 # Resource:: 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.