diff options
| author | Tensibai <tensibai@iabis.net> | 2019-05-02 22:03:04 +0000 |
|---|---|---|
| committer | Tensibai <tensibai@iabis.net> | 2019-05-02 22:03:04 +0000 |
| commit | 61b913af34f1b769eaf2281145beed3f591c2f7e (patch) | |
| tree | 727386e4e3d5f797b9af619be34e4395db44c23b /lib/chef/knife.rb | |
| parent | bb3fb62a356e75b5582d1e03d5343be82de34b54 (diff) | |
| download | chef-61b913af34f1b769eaf2281145beed3f591c2f7e.tar.gz | |
Reload the changes, adapt a bit
Signed-off-by: Tensibai <tensibai@iabis.net>
Diffstat (limited to 'lib/chef/knife.rb')
| -rw-r--r-- | lib/chef/knife.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 08224b37e1..da9c1ab1e9 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -474,7 +474,7 @@ class Chef when OpenSSL::SSL::SSLError ui.error "Could not establish a secure connection to the server." ui.info "Use `knife ssl check` to troubleshoot your SSL configuration." - ui.info "If your #{Chef::Dist::PRODUCT} Server uses a self-signed certificate, you can use" + ui.info "If your server uses a self-signed certificate, you can use" ui.info "`knife ssl fetch` to make knife trust the server's certificates." ui.info "" ui.info "Original Exception: #{e.class.name}: #{e.message}" @@ -507,7 +507,7 @@ class Chef ui.error "You authenticated successfully to #{server_url} as #{username} but you are not authorized for this action." proxy_env_vars = ENV.to_hash.keys.map(&:downcase) & %w{http_proxy https_proxy ftp_proxy socks_proxy no_proxy} unless proxy_env_vars.empty? - ui.error "There are proxy servers configured, your #{Chef::Dist::PRODUCT} server may need to be added to NO_PROXY." + ui.error "There are proxy servers configured, your server url may need to be added to NO_PROXY." end ui.info "Response: #{format_rest_error(response)}" when Net::HTTPBadRequest @@ -530,7 +530,7 @@ class Chef client_api_version = version_header["request_version"] min_server_version = version_header["min_version"] max_server_version = version_header["max_version"] - ui.error "The version of #{Chef::Dist::PRODUCT} API that Knife is using is not supported by the server you sent this request to." + ui.error "The API version that Knife is using is not supported by the server you sent this request to." ui.info "The request that Knife sent was using API version #{client_api_version}." ui.info "The server you sent the request to supports a min API verson of #{min_server_version} and a max API version of #{max_server_version}." ui.info "Please either update your #{Chef::Dist::PRODUCT} or the server to be a compatible set." |