summaryrefslogtreecommitdiff
path: root/chef-config
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-12-11 09:08:27 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2015-12-11 09:08:27 -0800
commit7bcd87fa3256d5b8a6e669975d632eb60003426c (patch)
tree6811e6dea378086e31c47daae1524aa839fa8e1b /chef-config
parent0388ad29f61e9816202b8b4ce5629511f48986e5 (diff)
parent8d718172dc3c1ce186f6e48efe514d7d566006cb (diff)
downloadchef-7bcd87fa3256d5b8a6e669975d632eb60003426c.tar.gz
Merge pull request #4273 from chef/jdm/default-auth-1.1
Use signing protocol 1.1 by default
Diffstat (limited to 'chef-config')
-rw-r--r--chef-config/lib/chef-config/config.rb15
1 files changed, 2 insertions, 13 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb
index 113bf481ff..870dd8273c 100644
--- a/chef-config/lib/chef-config/config.rb
+++ b/chef-config/lib/chef-config/config.rb
@@ -444,19 +444,8 @@ module ChefConfig
# Sets the version of the signed header authentication protocol to use (see
# the 'mixlib-authorization' project for more detail). Currently, versions
- # 1.0 and 1.1 are available; however, the chef-server must first be
- # upgraded to support version 1.1 before clients can begin using it.
- #
- # Version 1.1 of the protocol is required when using a `node_name` greater
- # than ~90 bytes (~90 ascii characters), so chef-client will automatically
- # switch to using version 1.1 when `node_name` is too large for the 1.0
- # protocol. If you intend to use large node names, ensure that your server
- # supports version 1.1. Automatic detection of large node names means that
- # users will generally not need to manually configure this.
- #
- # In the future, this configuration option may be replaced with an
- # automatic negotiation scheme.
- default :authentication_protocol_version, "1.0"
+ # 1.0 and 1.1 are available.
+ default :authentication_protocol_version, "1.1"
# This key will be used to sign requests to the Chef server. This location
# must be writable by Chef during initial setup when generating a client