MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

This commit is contained in:
Ylian Saint-Hilaire 2021-11-18 12:00:52 -08:00
parent 17913da65f 6b6d4b95c0
commit 3cca0d5847
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db.js
View File

@ -1973,6 +1973,8 @@ module.exports.CreateDB = function (parent, func) {
if (props.host) { cmd += ' -h ' + props.host; } if (props.host) { cmd += ' -h ' + props.host; }
if (props.port) { cmd += ' -P ' + props.port; } if (props.port) { cmd += ' -P ' + props.port; }
if (props.awsrds) { cmd += ' --single-transaction'; }
// SSL options different on mariadb/mysql // SSL options different on mariadb/mysql
var sslOptions = ''; var sslOptions = '';
if (obj.databaseType == 4) { if (obj.databaseType == 4) {

2
meshcentral-config-schema.json
View File

@ -22,6 +22,7 @@
"password": { "type": "string", "description": "MariaDB password" }, "password": { "type": "string", "description": "MariaDB password" },
"connectionLimit": { "type": "number", "description": "MariaDB connection limit" }, "connectionLimit": { "type": "number", "description": "MariaDB connection limit" },
"database": { "type": "string", "default": "meshcentral", "description": "Name of MariaDB database used" }, "database": { "type": "string", "default": "meshcentral", "description": "Name of MariaDB database used" },
"awsrds": { "type": "boolean", "default": false, "description": "Set true to resolve LOCK TABLE permissions on AWS RDS." },
"ssl": { "ssl": {
"type": "object", "type": "object",
"description": "SSL Options. Set to true (boolean) for default options.", "description": "SSL Options. Set to true (boolean) for default options.",
@ -43,6 +44,7 @@
"user": { "type": "string", "description": "MySQL username" }, "user": { "type": "string", "description": "MySQL username" },
"password": { "type": "string", "description": "MySQL password" }, "password": { "type": "string", "description": "MySQL password" },
"database": { "type": "string", "default": "meshcentral", "description": "Name of MySQL database used" }, "database": { "type": "string", "default": "meshcentral", "description": "Name of MySQL database used" },
"awsrds": { "type": "boolean", "default": false, "description": "Set true to resolve LOCK TABLE permissions on AWS RDS." },
"ssl": { "ssl": {
"type": "object", "type": "object",
"description": "SSL Options. Set to true (boolean) for default options.", "description": "SSL Options. Set to true (boolean) for default options.",