From ff990839cb54893a904a9102a0df5431155b58ae Mon Sep 17 00:00:00 2001 From: matt wilkie Date: Sun, 25 May 2025 13:43:00 -0700 Subject: [PATCH 1/2] fix broken link to config-sample.ini --- .../Advanced Usage/Configuration (config.ini or e.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.md b/docs/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.md index b616f4097..56a164621 100644 --- a/docs/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.md +++ b/docs/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.md @@ -1,5 +1,5 @@ # Configuration (config.ini or environment variables) -Trilium supports configuration via a file named `config.ini` and environment variables. Please review the file named [config-sample.ini](https://github.com/TriliumNext/Notes/blob/develop/config-sample.ini) in the [Notes](https://github.com/TriliumNext/Notes) repository to see what values are supported. +Trilium supports configuration via a file named `config.ini` and environment variables. Please review the file named [config-sample.ini](https://github.com/TriliumNext/Notes/blob/develop/apps/server/src/assets/config-sample.ini) in the [Notes](https://github.com/TriliumNext/Notes) repository to see what values are supported. You can provide the same values via environment variables instead of the `config.ini` file, and these environment variables use the following format: @@ -27,4 +27,4 @@ The code will: 1. First load the `config.ini` file as before 2. Then scan all environment variables for ones starting with `TRILIUM_` 3. Parse these variables into section/key pairs -4. Merge them with the config from the file, with environment variables taking precedence \ No newline at end of file +4. Merge them with the config from the file, with environment variables taking precedence From 3d22a64b5aea8672d226bcb7a6dec1649a49454e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Mon, 26 May 2025 08:18:54 +0300 Subject: [PATCH 2/2] chore(docs): update public documentation as well --- .../Advanced Usage/Configuration (config.ini or e.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.html index a77f87038..923cbdf03 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.html @@ -1,5 +1,5 @@

Trilium supports configuration via a file named config.ini and - environment variables. Please review the file named config-sample.ini in + environment variables. Please review the file named config-sample.ini in the Notes repository to see what values are supported.

You can provide the same values via environment variables instead of the config.ini file,