diff --git a/Database/mySQL.js b/Database/mySQL.js index 7b978fc..7029f79 100644 --- a/Database/mySQL.js +++ b/Database/mySQL.js @@ -4,12 +4,12 @@ require('dotenv').config({ path: path.resolve(__dirname, '../.env') }) const Sequelize = require("sequelize"); const sequelize = new Sequelize( - "adminusers", + "eco_saver", process.env.DB_USER, process.env.DB_PASS, { - host: "mpsqldatabasean.mysql.database.azure.com", + host: "mpsqldatabase.mysql.database.azure.com", dialect: 'mysql' } ); diff --git a/Sean/modules/mysql.js b/Sean/modules/mysql.js index 0bbe922..3e9bf94 100644 --- a/Sean/modules/mysql.js +++ b/Sean/modules/mysql.js @@ -1,5 +1,8 @@ const mysql = require("mysql2"); - +const path = require("path"); +require('dotenv').config({ path: path.resolve(__dirname, '../../.env') }) +const fs = require('fs'); +/* const mysqlConfig = { host: process.env.host, user: process.env.user, @@ -16,6 +19,17 @@ connection.connect((err) => { } console.log("Connected to MySQL"); }); +*/ +const connection = mysql.createConnection({ + host: process.env.host, + user: process.env.DB_USER, + password: process.env.DB_PASS, + database: "eco_saver", + ssl: { + ca: fs.readFileSync(path.resolve(__dirname, '../../cert/DigiCertGlobalRootCA.crt.pem')), + } + }); -module.exports = { connection , mysqlConfig }; \ No newline at end of file + +module.exports = { connection }; \ No newline at end of file diff --git a/Web-Server/modules/mqtt.js b/Web-Server/modules/mqtt.js index fdb284c..e479d38 100644 --- a/Web-Server/modules/mqtt.js +++ b/Web-Server/modules/mqtt.js @@ -11,7 +11,7 @@ const options = { password: process.env.MQTT_PASS, protocol: 'mqtts', // Use MQTT over TLS key: fs.readFileSync(path.resolve(__dirname, '../../cert/privkey.pem')), - cert: fs.readFileSync(path.resolve(__dirname, '../../cert/cert.pem')), + cert: fs.readFileSync(path.resolve(__dirname, '../../cert/cert.pem')), };