Merge pull request #4825 from NginxProxyManager/develop

v2.13.0

backend/lib/config.js

@@ -25,12 +25,6 @@ const configure = () => {
 
 		if (configData?.database) {
 			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.keys = getKeys();
 			return;
@@ -39,12 +33,12 @@ const configure = () => {
 
 	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) {
 		// we have enough mysql creds to go with mysql
 		logger.info("Using MySQL configuration");

frontend/src/components/Table/Formatter/CertificateFormatter.tsx

@@ -5,14 +5,5 @@ interface Props {
 	certificate?: Certificate;
 }
 export function CertificateFormatter({ certificate }: Props) {
-	let translation = "http-only";
+	return <T id={certificate ? "lets-encrypt" : "http-only"} />;
-	if (certificate) {
-		translation = certificate.provider;
-		if (translation === "letsencrypt") {
-			translation = "lets-encrypt";
-		} else if (translation === "other") {
-			translation = "certificates.custom";
-		}
-	}
-	return <T id={translation} />;
 }

frontend/src/locale/lang/en.json

@@ -32,7 +32,6 @@
   "certificate.none.subtitle.for-http": "This host will not use HTTPS",
   "certificate.none.title": "None",
   "certificate.not-in-use": "Not Used",
-  "certificate.renew": "Renew Certificate",
   "certificates": "Certificates",
   "certificates.custom": "Custom Certificate",
   "certificates.custom.warning": "Key files protected with a passphrase are not supported.",

frontend/src/locale/src/en.json

@@ -98,9 +98,6 @@
 	"certificate.not-in-use": {
 		"defaultMessage": "Not Used"
 	},
-	"certificate.renew": {
-		"defaultMessage": "Renew Certificate"
-	},
 	"certificates": {
 		"defaultMessage": "Certificates"
 	},

frontend/src/modals/RenewCertificateModal.tsx

@@ -47,7 +47,7 @@ const RenewCertificateModal = EasyModal.create(({ id, visible, remove }: Props)
 		<Modal show={visible} onHide={isSubmitting ? undefined : remove}>
 			<Modal.Header closeButton={!isSubmitting}>
 				<Modal.Title>
-					<T id="certificate.renew" />
+					<T id="renew-certificate" />
 				</Modal.Title>
 			</Modal.Header>
 			<Modal.Body>

frontend/src/pages/AuditLog/Table.tsx

@@ -24,6 +24,10 @@ export default function Table({ data, isFetching, onSelectItem }: Props) {
 					className: "w-1",
 				},
 			}),
+			columnHelper.accessor((row: AuditLog) => row.user?.name, {
+				id: "user.name",
+				header: intl.formatMessage({ id: "column.name" }),
+			}),
 			columnHelper.accessor((row: AuditLog) => row, {
 				id: "objectType",
 				header: intl.formatMessage({ id: "column.event" }),