Fix storage-s3/temp being in wrong directories. Everything still worked since they had the right content for yargs to do its thing. Fixes #555.

This commit is contained in:
Simo Kinnunen
2017-03-08 12:59:45 +09:00
parent d8f75de801
commit 54263114cf
2 changed files with 34 additions and 34 deletions

View File

@@ -1,33 +1,43 @@
module.exports.command = 'storage-temp'
module.exports.command = 'storage-s3'
module.exports.describe = 'Start a temp storage unit.'
module.exports.describe = 'Start an S3 storage unit.'
module.exports.builder = function(yargs) {
var os = require('os')
return yargs
.env('STF_STORAGE_TEMP')
.env('STF_STORAGE_S3')
.strict()
.option('bucket', {
describe: 'S3 bucket name.'
, type: 'string'
, demand: true
})
.option('endpoint', {
describe: 'S3 bucket endpoint.'
, type: 'string'
, demand: true
})
.option('port', {
alias: 'p'
, describe: 'The port to bind to.'
, type: 'number'
, default: process.env.PORT || 7100
})
.option('save-dir', {
describe: 'The location where files are saved to.'
.option('profile', {
describe: 'AWS credentials profile name.'
, type: 'string'
, default: os.tmpdir()
, demand: true
})
.epilog('Each option can be be overwritten with an environment variable ' +
'by converting the option to uppercase, replacing dashes with ' +
'underscores and prefixing it with `STF_STORAGE_TEMP_` (e.g. ' +
'`STF_STORAGE_TEMP_SAVE_DIR`).')
'underscores and prefixing it with `STF_STORAGE_S3_` (e.g. ' +
'`STF_STORAGE_S3_PROFILE`).')
}
module.exports.handler = function(argv) {
return require('../../units/storage/temp')({
return require('../../units/storage/s3')({
port: argv.port
, saveDir: argv.saveDir
, profile: argv.profile
, bucket: argv.bucket
, endpoint: argv.endpoint
})
}