added env variables for rethinkdb

.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

helpers/sqlite-to-rethink/index.js

@@ -7,7 +7,7 @@ const config = {
 
 	dbName: 'dev',
 
-	dropTables: false,
+	dropTables: true,
 
 	maxBusy: 100,
 

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
 };

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);

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;
 }

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);