diff --git a/sample.config.yaml b/sample.config.yaml index a8f8c9549..0ba83efd5 100644 --- a/sample.config.yaml +++ b/sample.config.yaml @@ -123,10 +123,18 @@ http: # Connection to the Redis server. redis: - # Syntax: redis://[db[:password]@]hostname[:port] + # Syntax: redis://[db[:password]@]hostname[:port][/db-number] # - # Default: redis://localhost:6379 - #uri: '' + # Default: redis://localhost:6379/0 + #uri: redis://redis.company.lan/42 + + # List of aliased commands. + # + # See http://redis.io/topics/security#disabling-of-specific-commands + #renameCommands: + # del: '3dda29ad-3015-44f9-b13b-fa570de92489' + # srem: '3fd758c9-5610-4e9d-a058-dbf4cb6d8bf0' + # Directory containing the database of XO. # Currently used for logs. diff --git a/src/collection/redis.js b/src/collection/redis.js index a8000af5d..1c56c76a6 100644 --- a/src/collection/redis.js +++ b/src/collection/redis.js @@ -36,7 +36,7 @@ export default class Redis extends Collection { connection, indexes = [], prefix, - uri = 'tcp://localhost:6379' + uri }) { super() diff --git a/src/xo.js b/src/xo.js index b70b9cdea..4fb2d27fd 100644 --- a/src/xo.js +++ b/src/xo.js @@ -41,7 +41,11 @@ export default class Xo extends EventEmitter { this._httpRequestWatchers = createRawObject() // Connects to Redis. - this._redis = createRedisClient(config.redis && config.redis.uri) + const redisConf = config.redis + this._redis = createRedisClient(redisConf && { + rename_commands: redisConf.renameCommands, + url: redisConf.uri + }) } // -----------------------------------------------------------------