diff --git a/src/storage/RedisAdapter.js b/src/storage/RedisAdapter.js index 8d0e97518..1d5975b16 100644 --- a/src/storage/RedisAdapter.js +++ b/src/storage/RedisAdapter.js @@ -148,11 +148,15 @@ export default class RedisAdapter extends ioredis { host: options.host, port: options.port, db: options.db, - password: options.pass + password: options.pass, }); } else { // If it IS the string URL, that'll be the first param for ioredis. result.unshift(options.url); } + if (options.tls) { + merge(opts, {tls: options.tls}); + } + return result; } @@ -160,9 +164,9 @@ export default class RedisAdapter extends ioredis { /** * Parses the options into what we care about. */ - static _defineOptions({ connectionTimeout, operationTimeout, url, host, port, db, pass }) { + static _defineOptions({ connectionTimeout, operationTimeout, url, host, port, db, pass, tls }) { const parsedOptions = { - connectionTimeout, operationTimeout, url, host, port, db, pass + connectionTimeout, operationTimeout, url, host, port, db, pass, tls }; return merge({}, DEFAULT_OPTIONS, parsedOptions); diff --git a/src/utils/settings/storage/node.js b/src/utils/settings/storage/node.js index 7be87a309..f95e7de63 100644 --- a/src/utils/settings/storage/node.js +++ b/src/utils/settings/storage/node.js @@ -46,6 +46,7 @@ const ParseStorageSettings = (settings) => { db, pass, url, + tls, connectionTimeout, operationTimeout } = options; @@ -73,7 +74,9 @@ const ParseStorageSettings = (settings) => { newOpts.db = db; newOpts.pass = pass; } - + if (tls) { + newOpts.tls = tls; + } return { type, prefix,