tcjlj/nginx-proxy-manager-zh
1
0
Fork 0
mirror of https://github.com/xiaoxinpro/nginx-proxy-manager-zh.git synced 2025-03-14 17:48:14 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix logical error with keys and mysql config

Browse Source
This commit is contained in:
Jamie Curnow 2023-03-21 17:59:27 +10:00
parent f8e6c8d018
commit 4fdc80be01
No known key found for this signature in database
GPG Key ID: FFBB624C43388E9E
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/lib/config.js
View File

@ -21,6 +21,7 @@ const configure = () => {
if (configData && configData.database) { if (configData && configData.database) {
logger.info(`Using configuration from file: ${filename}`); logger.info(`Using configuration from file: ${filename}`);
instance = configData; instance = configData;
instance.keys = getKeys();
return; return;
} }
} }
@ -39,7 +40,8 @@ const configure = () => {
user: envMysqlUser, user: envMysqlUser,
password: process.env.DB_MYSQL_PASSWORD, password: process.env.DB_MYSQL_PASSWORD,
name: envMysqlName, name: envMysqlName,
} },
keys: getKeys(),
}; };
return; return;
} }
@ -56,9 +58,12 @@ const configure = () => {
}, },
useNullAsDefault: true useNullAsDefault: true
} }
} },
keys: getKeys(),
};
}; };
const getKeys = () => {
// Get keys from file // Get keys from file
if (!fs.existsSync(keysFile)) { if (!fs.existsSync(keysFile)) {
generateKeys(); generateKeys();
@ -66,13 +71,11 @@ const configure = () => {
logger.info('Keys file exists OK'); logger.info('Keys file exists OK');
} }
try { try {
instance.keys = require(keysFile); return require(keysFile);
} catch (err) { } catch (err) {
logger.error('Could not read JWT key pair from config file: ' + keysFile, err); logger.error('Could not read JWT key pair from config file: ' + keysFile, err);
process.exit(1); process.exit(1);
} }
logger.debug('Configuration: ' + JSON.stringify(instance, null, 2));
}; };
const generateKeys = () => { const generateKeys = () => {