fix: add option to disable tls
This commit is contained in:
+26
-17
@@ -45,36 +45,45 @@ if (!config.noLDAP) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let dbpoolOpts = {
|
||||||
|
|
||||||
var dbpool = new Pool({
|
|
||||||
database: config.database.name,
|
database: config.database.name,
|
||||||
user: config.database.user,
|
user: config.database.user,
|
||||||
password: config.database.pass,
|
password: config.database.pass,
|
||||||
host: config.database.host,
|
host: config.database.host,
|
||||||
port: config.database.port,
|
port: config.database.port,
|
||||||
ssl: { rejectUnauthorized: false },
|
|
||||||
max: 20, // set pool max size to 20
|
max: 20, // set pool max size to 20
|
||||||
min: 4, // set min pool size to 4
|
min: 4, // set min pool size to 4
|
||||||
idleTimeoutMillis: config.database.idleTimeoutMillis, // close idle clients after 1 second
|
idleTimeoutMillis: config.database.idleTimeoutMillis, // close idle clients after 1 second
|
||||||
connectionTimeoutMillis: config.database.connectionTimeoutMillis, // return an error after 1 second if connection could not be established
|
connectionTimeoutMillis: config.database.connectionTimeoutMillis, // return an error after 1 second if connection could not be established
|
||||||
})
|
}
|
||||||
|
|
||||||
|
if (!config.disableDBtls) {
|
||||||
|
dbpoolOpts['ssl'] = { rejectUnauthorized: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
var dbpool = new Pool(dbpoolOpts);
|
||||||
|
|
||||||
|
|
||||||
|
let projectPoolOpts = {
|
||||||
|
database: config.vncproject.name,
|
||||||
|
user: config.vncproject.user,
|
||||||
|
password: config.vncproject.pass,
|
||||||
|
host: config.vncproject.host,
|
||||||
|
port: config.vncproject.port,
|
||||||
|
max: 20, // set pool max size to 20
|
||||||
|
min: 4, // set min pool size to 4
|
||||||
|
idleTimeoutMillis: config.database.idleTimeoutMillis, // close idle clients after 1 second
|
||||||
|
connectionTimeoutMillis: config.database.connectionTimeoutMillis, // return an error after 1 second if connection could not be established
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!config.disableDBtls) {
|
||||||
|
projectPoolOpts['ssl'] = { rejectUnauthorized: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
var projectPool;
|
var projectPool;
|
||||||
if (config.vncproject) {
|
if (config.vncproject) {
|
||||||
projectPool = new Pool({
|
projectPool = new Pool(projectPoolOpts);
|
||||||
database: config.vncproject.name,
|
|
||||||
user: config.vncproject.user,
|
|
||||||
password: config.vncproject.pass,
|
|
||||||
host: config.vncproject.host,
|
|
||||||
port: config.vncproject.port,
|
|
||||||
ssl: { rejectUnauthorized: false },
|
|
||||||
max: 20, // set pool max size to 20
|
|
||||||
min: 4, // set min pool size to 4
|
|
||||||
idleTimeoutMillis: config.database.idleTimeoutMillis, // close idle clients after 1 second
|
|
||||||
connectionTimeoutMillis: config.database.connectionTimeoutMillis, // return an error after 1 second if connection could not be established
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
app.use(bodyParser.json()); // for parsing application/json
|
app.use(bodyParser.json()); // for parsing application/json
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ module.exports = {
|
|||||||
domain: 'dev.vnc.de',
|
domain: 'dev.vnc.de',
|
||||||
xmppToken: 'xah6niighohshieKahtah',
|
xmppToken: 'xah6niighohshieKahtah',
|
||||||
useRedmineAuth: true,
|
useRedmineAuth: true,
|
||||||
|
disableDBtls: false,
|
||||||
ldap: {
|
ldap: {
|
||||||
ldapUri: 'none',
|
ldapUri: 'none',
|
||||||
bindDn: 'uid=zimbra,cn=admins,cn=zimbra',
|
bindDn: 'uid=zimbra,cn=admins,cn=zimbra',
|
||||||
|
|||||||
Reference in New Issue
Block a user