From 479ef6348079bfb0624b39a6dd359be8202c914e Mon Sep 17 00:00:00 2001
From: JYC333 <22962980+JYC333@users.noreply.github.com>
Date: Fri, 16 May 2025 11:02:06 +0800
Subject: [PATCH] update MFA docs
---
.../Server Installation/Multi-Factor Authentication.html | 6 +++---
.../Server Installation/Multi-Factor Authentication.md | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html
index 362a5d1f8..0ec7a8756 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html
@@ -40,10 +40,10 @@
setup an OpenID service through google.
- Set the
oauthBaseUrl
, oauthClientId
and oauthClientSecret
in
- the config.ini
file, which located under the Trilium data folder.
+ the config.ini
file (check Configuration (config.ini or environment variables) for
+ more information).
- - You can also setup through environment variables (
TRILIUM_OAUTH_BASE_URL
, TRILIUM_OAUTH_CLIENT_ID
and TRILIUM_OAUTH_CLIENT_SECRET
),
- but the recommanded way is setup through config.ini
file.
+ - You can also setup through environment variables (
TRILIUM_OAUTH_BASE_URL
, TRILIUM_OAUTH_CLIENT_ID
and TRILIUM_OAUTH_CLIENT_SECRET
).
- Restart the server
diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.md
index ceeac36d2..f3cbe1335 100644
--- a/docs/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.md
+++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.md
@@ -34,8 +34,8 @@ _Currently only compatible with Google. Other services like Authentik and Auth0
In order to setup OpenID, you will need to setup a authentication provider. This requires a bit of extra setup. Follow [these instructions](https://developers.google.com/identity/openid-connect/openid-connect) to setup an OpenID service through google.
-1. Set the `oauthBaseUrl`, `oauthClientId` and `oauthClientSecret` in the `config.ini` file, which located under the Trilium data folder.
- 1. You can also setup through environment variables (`TRILIUM_OAUTH_BASE_URL`, `TRILIUM_OAUTH_CLIENT_ID` and `TRILIUM_OAUTH_CLIENT_SECRET`), but the recommanded way is setup through `config.ini` file.
+1. Set the `oauthBaseUrl`, `oauthClientId` and `oauthClientSecret` in the `config.ini` file (check Configuration (config.ini or environment variables) for more information).
+ 1. You can also setup through environment variables (`TRILIUM_OAUTH_BASE_URL`, `TRILIUM_OAUTH_CLIENT_ID` and `TRILIUM_OAUTH_CLIENT_SECRET`).
2. Restart the server
3. Go to "Menu" -> "Options" -> "MFA"
4. Click the “Enable Multi-Factor Authentication” checkbox if not checked