Merge pull request #2762 from jaymzh/sslwarn

Suppress SSL warnings if I know what I'm doing

1 files changed, 0 insertions, 33 deletions

diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 77f63671d7..3d9678ea31 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -419,8 +419,6 @@ class Chef
       begin
         runlock.save_pid
 
-        check_ssl_config
-
         request_id = Chef::RequestID.instance.request_id
         run_context = nil
         @events.run_start(Chef::VERSION)
@@ -529,37 +527,6 @@ class Chef
       Chef::ReservedNames::Win32::Security.has_admin_privileges?
     end
 
-    def check_ssl_config
-      if Chef::Config[:ssl_verify_mode] == :verify_none and !Chef::Config[:verify_api_cert]
-        Chef::Log.warn(<<-WARN)
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-SSL validation of HTTPS requests is disabled. HTTPS connections are still
-encrypted, but chef is not able to detect forged replies or man in the middle
-attacks.
-
-To fix this issue add an entry like this to your configuration file:
-
-```
-  # Verify all HTTPS connections (recommended)
-  ssl_verify_mode :verify_peer
-
-  # OR, Verify only connections to chef-server
-  verify_api_cert true
-```
-
-To check your SSL configuration, or troubleshoot errors, you can use the
-`knife ssl check` command like so:
-
-```
-  knife ssl check -c #{Chef::Config.config_file}
-```
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-WARN
-      end
-    end
-
   end
 end