From 0882ececb7cafcb58fd9a1d203d0dd6cd1da5503 Mon Sep 17 00:00:00 2001
From: Big Bad Waffle <skichenbrand@gmail.com>
Date: Mon, 4 Mar 2019 20:56:26 +0200
Subject: [PATCH] added env variables for rethinkdb

---
 .gitignore                         | 2 +-
 helpers/sqlite-to-rethink/index.js | 2 +-
 src/server/config/serverConfig.js  | 9 ++++++---
 src/server/mail/mail.js            | 5 +----
 src/server/security/io.js          | 3 +--
 src/server/security/ioRethink.js   | 6 ++----
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 38a596fc..06a3b903 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,4 @@ firebaseConfig.js
 helpers/sqlite-to-rethink/rethinkdb_data
 helpers/sqlite-to-rethink/tmp
 helpers/sqlite-to-rethink/log_file
-helpers/sqlite-to-rethink/rethink.exe
+helpers/sqlite-to-rethink/rethinkdb.exe
diff --git a/helpers/sqlite-to-rethink/index.js b/helpers/sqlite-to-rethink/index.js
index 9f482b14..97424fd3 100644
--- a/helpers/sqlite-to-rethink/index.js
+++ b/helpers/sqlite-to-rethink/index.js
@@ -7,7 +7,7 @@ const config = {
 
 	dbName: 'dev',
 
-	dropTables: false,
+	dropTables: true,
 
 	maxBusy: 100,
 
diff --git a/src/server/config/serverConfig.js b/src/server/config/serverConfig.js
index 7857bc89..54a3a240 100644
--- a/src/server/config/serverConfig.js
+++ b/src/server/config/serverConfig.js
@@ -7,7 +7,10 @@ module.exports = {
 	//Options: 
 	// sqlite
 	// rethink
-	db: 'rethink',
-	dbHost: 'localhost',
-	dbPort: 28015
+	//eslint-disable-next-line no-process-env
+	db: process.env.IWD_DB || 'rethink',
+	//eslint-disable-next-line no-process-env
+	dbHost: process.env.IWD_DB_HOST || 'localhost',
+	//eslint-disable-next-line no-process-env
+	dbPort: process.env.IWD_DB_PORT || 28015
 };
diff --git a/src/server/mail/mail.js b/src/server/mail/mail.js
index 5e02a375..72485240 100644
--- a/src/server/mail/mail.js
+++ b/src/server/mail/mail.js
@@ -1,12 +1,9 @@
 let serverConfig = require('../config/serverConfig');
 
-//eslint-disable-next-line no-process-env
-const useDb = process.env.db || serverConfig.db;
-
 const moduleMap = {
 	sqlite: 'Sqlite',
 	rethink: 'RethinkDb'
 };
-const modulePath = `./mail${moduleMap[useDb]}`;
+const modulePath = `./mail${moduleMap[serverConfig.db]}`;
 
 module.exports = require(modulePath);
diff --git a/src/server/security/io.js b/src/server/security/io.js
index a820e391..8eed9f84 100644
--- a/src/server/security/io.js
+++ b/src/server/security/io.js
@@ -1,8 +1,7 @@
 let util = require('util');
 let serverConfig = require('../config/serverConfig');
 
-//eslint-disable-next-line no-process-env
-if ((process.env.db || serverConfig.db) === 'rethink') {
+if (serverConfig.db === 'rethink') {
 	module.exports = require('./ioRethink');
 	return;
 }
diff --git a/src/server/security/ioRethink.js b/src/server/security/ioRethink.js
index 0426259c..27d2313a 100644
--- a/src/server/security/ioRethink.js
+++ b/src/server/security/ioRethink.js
@@ -22,10 +22,8 @@ module.exports = {
 
 	init: async function (cbReady) {
 		const dbConfig = {
-			//eslint-disable-next-line no-process-env
-			host: process.env.dbHost || serverConfig.dbHost || 'localhost',
-			//eslint-disable-next-line no-process-env
-			port: process.env.dbPort || serverConfig.dbPort || 28015
+			host: serverConfig.dbHost,
+			port: serverConfig.dbPort
 		};
 
 		this.connection = await r.connect(dbConfig);