Merge branch '1737-rethink-user-pass' into 'master'

devops[#1737]: User and pass for rethink conn

Closes #1737

See merge request Isleward/isleward!537

src/server/config/serverConfig.js

@@ -14,5 +14,9 @@ module.exports = {
 	//eslint-disable-next-line no-process-env
 	dbPort: process.env.IWD_DB_PORT || 28015,
 	//eslint-disable-next-line no-process-env
-	dbName: process.env.IWD_DB_NAME || 'live'
+	dbName: process.env.IWD_DB_NAME || 'live',
+	//eslint-disable-next-line no-process-env
+	dbUser: process.env.IWD_DB_USER || 'admin',
+	//eslint-disable-next-line no-process-env
+	dbPass: process.env.IWD_DB_PASS || ''
 };

src/server/db/ioRethink.js

@@ -4,7 +4,9 @@ const tableNames = require('./tableNames');
 const r = require('rethinkdbdash')({
 	host: serverConfig.dbHost,
 	port: serverConfig.dbPort,
-	db: serverConfig.dbName
+	db: serverConfig.dbName,
+	user: serverConfig.dbUser,
+	password: serverConfig.dpPass
 });
 
 module.exports = {