mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2025-12-06 16:26:50 +00:00
Compare commits
2 Commits
06b67ed4bc
...
f35671db21
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f35671db21 | ||
|
|
a3a0614948 |
@@ -25,6 +25,12 @@ const configure = () => {
|
|||||||
|
|
||||||
if (configData?.database) {
|
if (configData?.database) {
|
||||||
logger.info(`Using configuration from file: ${filename}`);
|
logger.info(`Using configuration from file: ${filename}`);
|
||||||
|
|
||||||
|
// Migrate those who have "mysql" engine to "mysql2"
|
||||||
|
if (configData.database.engine === "mysql") {
|
||||||
|
configData.database.engine = mysqlEngine;
|
||||||
|
}
|
||||||
|
|
||||||
instance = configData;
|
instance = configData;
|
||||||
instance.keys = getKeys();
|
instance.keys = getKeys();
|
||||||
return;
|
return;
|
||||||
@@ -33,12 +39,12 @@ const configure = () => {
|
|||||||
|
|
||||||
const toBool = (v) => /^(1|true|yes|on)$/i.test((v || '').trim());
|
const toBool = (v) => /^(1|true|yes|on)$/i.test((v || '').trim());
|
||||||
|
|
||||||
const envMysqlHost = process.env.DB_MYSQL_HOST || null;
|
const envMysqlHost = process.env.DB_MYSQL_HOST || null;
|
||||||
const envMysqlUser = process.env.DB_MYSQL_USER || null;
|
const envMysqlUser = process.env.DB_MYSQL_USER || null;
|
||||||
const envMysqlName = process.env.DB_MYSQL_NAME || null;
|
const envMysqlName = process.env.DB_MYSQL_NAME || null;
|
||||||
const envMysqlSSL = toBool(process.env.DB_MYSQL_SSL);
|
const envMysqlSSL = toBool(process.env.DB_MYSQL_SSL);
|
||||||
const envMysqlSSLRejectUnauthorized = process.env.DB_MYSQL_SSL_REJECT_UNAUTHORIZED === undefined ? true : toBool(process.env.DB_MYSQL_SSL_REJECT_UNAUTHORIZED);
|
const envMysqlSSLRejectUnauthorized = process.env.DB_MYSQL_SSL_REJECT_UNAUTHORIZED === undefined ? true : toBool(process.env.DB_MYSQL_SSL_REJECT_UNAUTHORIZED);
|
||||||
const envMysqlSSLVerifyIdentity = process.env.DB_MYSQL_SSL_VERIFY_IDENTITY === undefined ? true : toBool(process.env.DB_MYSQL_SSL_VERIFY_IDENTITY);
|
const envMysqlSSLVerifyIdentity = process.env.DB_MYSQL_SSL_VERIFY_IDENTITY === undefined ? true : toBool(process.env.DB_MYSQL_SSL_VERIFY_IDENTITY);
|
||||||
if (envMysqlHost && envMysqlUser && envMysqlName) {
|
if (envMysqlHost && envMysqlUser && envMysqlName) {
|
||||||
// we have enough mysql creds to go with mysql
|
// we have enough mysql creds to go with mysql
|
||||||
logger.info("Using MySQL configuration");
|
logger.info("Using MySQL configuration");
|
||||||
|
|||||||
@@ -5,5 +5,14 @@ interface Props {
|
|||||||
certificate?: Certificate;
|
certificate?: Certificate;
|
||||||
}
|
}
|
||||||
export function CertificateFormatter({ certificate }: Props) {
|
export function CertificateFormatter({ certificate }: Props) {
|
||||||
return <T id={certificate ? "lets-encrypt" : "http-only"} />;
|
let translation = "http-only";
|
||||||
|
if (certificate) {
|
||||||
|
translation = certificate.provider;
|
||||||
|
if (translation === "letsencrypt") {
|
||||||
|
translation = "lets-encrypt";
|
||||||
|
} else if (translation === "other") {
|
||||||
|
translation = "certificates.custom";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return <T id={translation} />;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user