summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2013-10-16 15:24:25 -0700
committerdanielsdeleo <dan@opscode.com>2013-10-16 17:52:52 -0700
commitbf7862f28f3342d0ccc88f2cc986847a2817c484 (patch)
treec1f008bd4cc7707e3d92cc3c426b9cc24673ca7b
parente191e7c324da77eee0e60550ea6dbabbad8fe3dd (diff)
downloadchef-bf7862f28f3342d0ccc88f2cc986847a2817c484.tar.gz
Add `verify_api_cert` setting in config.rb
-rw-r--r--lib/chef/config.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/chef/config.rb b/lib/chef/config.rb
index 82dfb85101..0442dcd13e 100644
--- a/lib/chef/config.rb
+++ b/lib/chef/config.rb
@@ -315,9 +315,21 @@ class Chef
# Set these to enable SSL authentication / mutual-authentication
# with the server
+
+ # Client side SSL cert/key for mutual auth
default :ssl_client_cert, nil
default :ssl_client_key, nil
+
+ # Whether or not to verify the SSL cert for all HTTPS requests. If set to
+ # :verify_peer, all HTTPS requests will be validated regardless of other
+ # SSL verification settings.
default :ssl_verify_mode, :verify_none
+
+ # Whether or not to verify the SSL cert for HTTPS requests to the Chef
+ # server API. If set to `true`, the server's cert will be validated
+ # regardless of the :ssl_verify_mode setting.
+ default :verify_api_cert, false
+
default :ssl_ca_path, nil
default :ssl_ca_file, nil