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/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.