Merge branch 'prod2' into prod

3 files changed, 3 insertions, 13 deletions

diff --git a/db/db.js b/db/db.js
index 06fdac89..9e7cc25b 100644
--- a/db/db.js
+++ b/db/db.js
@@ -1,13 +1,5 @@
 import Sequelize from "@sequelize/core";
-import dbOptions from "../config/knexfile";
+import config from "$config";
 
-let { database, user, password, host } = dbOptions[
-  process.env.NODE_ENV
-].connection;
-
-export default new Sequelize(database, user, password, {
-  host,
-  dialect: "mariadb",
-  logging: false,
-  dialectOptions: { multipleStatements: true, timezone: "Etc/GMT+7" }
-});
+let { database, user, password, options } = config.db;
+export default new Sequelize(database, user, password, options);
diff --git a/db/index.js b/db/index.js
index 3d5aab36..8c94a4d3 100644
--- a/db/index.js
+++ b/db/index.js
@@ -1,7 +1,6 @@
 import Sequelize from "@sequelize/core";
 
 import db from "$db/db";
-import dbOptions from "$config/knexfile";
 
 db.authenticate().catch(err => {
   console.debug("Error connecting to database: " + err.message);
diff --git a/db/knexfile.js b/db/knexfile.js
deleted file mode 120000
index 3cf75ae7..00000000
--- a/db/knexfile.js
+++ /dev/null
@@ -1 +0,0 @@
-./../config/knexfile.js
\ No newline at end of file