Update redis and mongo env variables

linagora · Feb 6, 2018 · 89521dc · 89521dc
1 parent 13265f5
commit 89521dc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -31,8 +31,8 @@ ADD . /src
 
 ADD config/db.json.docker /src/config/db.json
 
-ENV HUBLIN_REDIS_HOST redis
-ENV HUBLIN_REDIS_PORT 6379
+ENV REDIS_HOST redis
+ENV REDIS_PORT 6379
 
 EXPOSE  8080
 

diff --git a/backend/core/db/redis/index.js b/backend/core/db/redis/index.js
@@ -10,8 +10,8 @@ var initialized = false,
     client;
 
 var defaultOptions = {
-  host: process.env.HUBLIN_REDIS_HOST || 'localhost',
-  port: process.env.HUBLIN_REDIS_PORT || 6379,
+  host: process.env.REDIS_HOST || 'localhost',
+  port: process.env.REDIS_PORT || 6379,
   client_options: {}
 };
 

diff --git a/fixtures/esn-config/data/redis.js b/fixtures/esn-config/data/redis.js
@@ -1,5 +1,5 @@
-const host = process.env.HUBLIN_REDIS_HOST || 'localhost';
-const port = process.env.HUBLIN_REDIS_PORT || 6379;
+const host = process.env.REDIS_HOST || 'localhost';
+const port = process.env.REDIS_PORT || 6379;
 
 module.exports = () => ({
   url: `redis://${host}:${port}`

diff --git a/test/config/servers-conf.js b/test/config/servers-conf.js
@@ -11,13 +11,13 @@ module.exports = {
   redis: {
     host: 'localhost',
     port: 6379,
-    url: `redis://${process.env.HUBLIN_REDIS_HOST || 'redis'}:6379`
+    url: `redis://${process.env.REDIS_HOST || 'redis'}:6379`
   },
 
   mongodb: {
     host: 'mongo',
     port: 27017,
     dbName: 'tests',
-    connectionString: `mongodb://${process.env.HUBLIN_MONGO_HOST || 'mongo'}:27017/tests`
+    connectionString: `mongodb://${process.env.MONGO_HOST || 'mongo'}:27017/tests`
   }
 };