Spearhead/node-spearhead
Archived
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

should support TRITON_KEY_ID as well

Browse Source
This commit is contained in:
Trent Mick 2015-09-25 10:22:58 -07:00
parent 7169b06772
commit f38bfb68f1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cli.js
View File

@ -103,7 +103,8 @@ var OPTIONS = [
{ {
names: ['keyId', 'k'], names: ['keyId', 'k'],
type: 'string', type: 'string',
help: 'SSH key fingerprint. Environment: SDC_KEY_ID=FINGERPRINT.', help: 'SSH key fingerprint. Environment: TRITON_KEY_ID=FINGERPRINT ' +
'or SDC_KEY_ID=FINGERPRINT.',
helpArg: 'FINGERPRINT' helpArg: 'FINGERPRINT'
}, },
{ {

2
lib/config.js
View File

@ -220,7 +220,7 @@ function _loadEnvProfile() {
envProfile.account = process.env.TRITON_ACCOUNT || process.env.SDC_ACCOUNT; envProfile.account = process.env.TRITON_ACCOUNT || process.env.SDC_ACCOUNT;
envProfile.url = process.env.TRITON_URL || process.env.SDC_URL; envProfile.url = process.env.TRITON_URL || process.env.SDC_URL;
envProfile.keyId = process.env.SDC_KEY_ID; envProfile.keyId = process.env.TRITON_KEY_ID || process.env.SDC_KEY_ID;
if (process.env.TRITON_TLS_INSECURE) { if (process.env.TRITON_TLS_INSECURE) {
envProfile.insecure = common.boolFromString( envProfile.insecure = common.boolFromString(
process.env.TRITON_TLS_INSECURE); process.env.TRITON_TLS_INSECURE);