ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-01-29 15:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Eugene Mirotin 2017-05-19 01:44:30 +03:00
parent b88f7a993c
commit 6ae59654a0
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/actions/ssh.js
View File

@ -42,7 +42,6 @@ module.exports = {
alias: 'v'
}, {
signature: 'noproxy',
parameter: 'noproxy',
boolean: true,
description: "don't use the proxy configuration for this connection. Only makes sense if you've configured proxy globally."
}
@ -90,11 +89,11 @@ module.exports = {
sshProxyCommand = '';
proxyConfig = global.PROXY_CONFIG;
if (proxyConfig && !options.noproxy) {
proxyAuth = proxyConfig.proxyAuth;
tunnelOptions = {
proxy: proxyConfig.host + ":" + proxyConfig.port,
dest: '%h:%p'
};
proxyAuth = proxyConfig.proxyAuth;
if (proxyAuth) {
i = proxyAuth.indexOf(':');
_.assign(tunnelOptions, {

2
doc/cli.markdown
View File

@ -786,7 +786,7 @@ ssh gateway port
increase verbosity
#### --noproxy <noproxy>
#### --noproxy
don't use the proxy configuration for this connection. Only makes sense if you've configured proxy globally.

3
lib/actions/ssh.coffee
View File

@ -50,7 +50,6 @@ module.exports =
alias: 'v'
,
signature: 'noproxy'
parameter: 'noproxy'
boolean: true
description: "don't use the proxy configuration for this connection.
Only makes sense if you've configured proxy globally."
@ -90,10 +89,10 @@ module.exports =
proxyConfig = global.PROXY_CONFIG
if proxyConfig and not options.noproxy
{ proxyAuth } = proxyConfig
tunnelOptions =
proxy: "#{proxyConfig.host}:#{proxyConfig.port}"
dest: '%h:%p'
{ proxyAuth } = proxyConfig
if proxyAuth
i = proxyAuth.indexOf(':')
_.assign tunnelOptions,