diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json index 154cbaa17d..3c7edbbd6e 100644 --- a/docs/User Guide/!!!meta.json +++ b/docs/User Guide/!!!meta.json @@ -236,7 +236,7 @@ "Dgg7bR3b6K9j", "3tW6mORuTHnB" ], - "title": "Packaged server installation", + "title": "Packaged version for Linux", "notePosition": 10, "prefix": null, "isExpanded": false, @@ -263,10 +263,17 @@ "value": "packaged-server-installation", "isInheritable": false, "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-tux", + "isInheritable": false, + "position": 30 } ], "format": "markdown", - "dataFileName": "Packaged server installation.md", + "dataFileName": "Packaged version for Linux.md", "attachments": [] }, { @@ -279,7 +286,7 @@ "Dgg7bR3b6K9j", "rWX5eY045zbE" ], - "title": "Docker Server Installation", + "title": "Using Docker", "notePosition": 20, "prefix": null, "isExpanded": false, @@ -306,10 +313,17 @@ "value": "docker-server-installation", "isInheritable": false, "position": 30 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-docker", + "isInheritable": false, + "position": 40 } ], "format": "markdown", - "dataFileName": "Docker Server Installation.md", + "dataFileName": "Using Docker.md", "attachments": [] }, { @@ -322,7 +336,7 @@ "Dgg7bR3b6K9j", "moVgBcoxE3EK" ], - "title": "NixOS server installation", + "title": "On NixOS", "notePosition": 30, "prefix": null, "isExpanded": false, @@ -335,10 +349,17 @@ "value": "nixos-server-installation", "isInheritable": false, "position": 10 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-tux", + "isInheritable": false, + "position": 20 } ], "format": "markdown", - "dataFileName": "NixOS server installation.md", + "dataFileName": "On NixOS.md", "attachments": [] }, { @@ -351,7 +372,7 @@ "Dgg7bR3b6K9j", "J1Bb6lVlwU5T" ], - "title": "Manual server installation", + "title": "Manually", "notePosition": 40, "prefix": null, "isExpanded": false, @@ -371,10 +392,31 @@ "value": "manual-server-installation", "isInheritable": false, "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-code-alt", + "isInheritable": false, + "position": 30 + }, + { + "type": "relation", + "name": "internalLink", + "value": "rWX5eY045zbE", + "isInheritable": false, + "position": 40 + }, + { + "type": "relation", + "name": "internalLink", + "value": "3tW6mORuTHnB", + "isInheritable": false, + "position": 50 } ], "format": "markdown", - "dataFileName": "Manual server installation.md", + "dataFileName": "Manually.md", "attachments": [] }, { @@ -387,7 +429,7 @@ "Dgg7bR3b6K9j", "DCmT6e7clMoP" ], - "title": "Kubernetes server installation", + "title": "Using Kubernetes", "notePosition": 50, "prefix": null, "isExpanded": false, @@ -400,10 +442,81 @@ "value": "kubernetes-server-installation", "isInheritable": false, "position": 10 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-kubernetes", + "isInheritable": false, + "position": 20 } ], "format": "markdown", - "dataFileName": "Kubernetes server installation.md", + "dataFileName": "Using Kubernetes.md", + "attachments": [] + }, + { + "isClone": false, + "noteId": "klCWNks3ReaQ", + "notePath": [ + "pOsGYCXsbNQG", + "Otzi9La2YAUX", + "WOcw2SLH6tbX", + "Dgg7bR3b6K9j", + "klCWNks3ReaQ" + ], + "title": "Multiple server instances", + "notePosition": 60, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "relation", + "name": "internalLink", + "value": "cbkrhQjrkKrh", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "3tW6mORuTHnB", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "rWX5eY045zbE", + "isInheritable": false, + "position": 30 + }, + { + "type": "relation", + "name": "internalLink", + "value": "moVgBcoxE3EK", + "isInheritable": false, + "position": 40 + }, + { + "type": "relation", + "name": "internalLink", + "value": "J1Bb6lVlwU5T", + "isInheritable": false, + "position": 50 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxs-user-account", + "isInheritable": false, + "position": 60 + } + ], + "format": "markdown", + "dataFileName": "Multiple server instances.md", "attachments": [] } ] diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation.md index 566517656b..7559bbe186 100644 --- a/docs/User Guide/User Guide/Installation & Setup/Server Installation.md +++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation.md @@ -5,14 +5,14 @@ This guide outlines the steps to install Trilium on your own server. You might c There are several ways to install Trilium on a server, each with its own advantages: -* **Recommended**: [Docker Installation](Server%20Installation/1.%20Installing%20the%20server/Docker%20Server%20Installation.md) - Available for **AMD64** and **ARM** architectures. -* [Packaged Server Installation](Server%20Installation/1.%20Installing%20the%20server/Packaged%20server%20installation.md) +* **Recommended**: [Docker Installation](Server%20Installation/1.%20Installing%20the%20server/Using%20Docker.md) - Available for **AMD64** and **ARM** architectures. +* [Packaged Server Installation](Server%20Installation/1.%20Installing%20the%20server/Packaged%20version%20for%20Linux.md) * [PikaPods managed hosting](https://www.pikapods.com/pods?run=trilium-next) -* [Manual Installation](Server%20Installation/1.%20Installing%20the%20server/Manual%20server%20installation.md) -* [Kubernetes](Server%20Installation/1.%20Installing%20the%20server/Kubernetes%20server%20installation.md) +* [Manual Installation](Server%20Installation/1.%20Installing%20the%20server/Manually.md) +* [Kubernetes](Server%20Installation/1.%20Installing%20the%20server/Using%20Kubernetes.md) * [Cloudron](https://www.cloudron.io/store/com.github.trilium.cloudronapp.html) * [HomelabOS](https://homelabos.com/docs/software/trilium/) -* [NixOS Module](Server%20Installation/1.%20Installing%20the%20server/NixOS%20server%20installation.md) +* [NixOS Module](Server%20Installation/1.%20Installing%20the%20server/On%20NixOS.md) The server installation includes both web and [mobile frontends](Mobile%20Frontend.md). diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manual server installation.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.md similarity index 78% rename from docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manual server installation.md rename to docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.md index e08e73a1d4..1ba3a1d6ac 100644 --- a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manual server installation.md +++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.md @@ -1,5 +1,6 @@ -# Manual server installation -This page describes manually installing Trilium on your server. **Note that this is a not well supported way to install Trilium, problems may appear, information laid out here is quite out of date. It is recommended to use either Docker or packaged build installation.** +# Manually +> [!WARNING] +> This page describes manually installing Trilium on your server. **Note that this is a not well supported way to install Trilium, problems may appear, information laid out here is quite out of date. It is recommended to use either** Docker Server Installation **or** Packaged server installation**.** ## Requirements diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Multiple server instances.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Multiple server instances.md new file mode 100644 index 0000000000..273856be56 --- /dev/null +++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Multiple server instances.md @@ -0,0 +1,22 @@ +# Multiple server instances +Trilium does not support multiple users. In order to have two or more persons with their own set of notes, multiple server instances must be set up. It is also not possible to use multiple [sync](../../Synchronization.md) servers. + +To allow multiple server instances on a single physical server: + +* For Packaged version for Linux or Manually, if starting the server manually just specify a different port and data directory per instance: + + ``` + TRILIUM_NETWORK_PORT=8080 TRILIUM_DATA_DIR=/path/to/your/data-dir-A /opt/trilium/trilium.sh + ``` + + For a second instance: + + ``` + TRILIUM_NETWORK_PORT=8081 TRILIUM_DATA_DIR=/path/to/your/data-dir-B /opt/trilium/trilium.sh + ``` + + If using `systemd`, then set the [environment variables in the service configuration](https://serverfault.com/questions/413397/how-to-set-environment-variable-in-systemd-service). +* For Using Docker, simply use two different containers, each with their own port binding and data directory. +* For On NixOS, the only possible way is to use Docker OCI containers or at least one NixOS container with its own service definition. + +For support or additional context, see the related [GitHub Discussion](https://github.com/orgs/TriliumNext/discussions/1642#discussioncomment-12768808). \ No newline at end of file diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/NixOS server installation.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/On NixOS.md similarity index 96% rename from docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/NixOS server installation.md rename to docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/On NixOS.md index e6d7398517..5516e419b4 100644 --- a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/NixOS server installation.md +++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/On NixOS.md @@ -1,4 +1,4 @@ -# NixOS server installation +# On NixOS This page describes configuring the Trilium module included in NixOS. ## Requirements diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged server installation.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.md similarity index 98% rename from docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged server installation.md rename to docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.md index c0842534eb..67f90eb905 100644 --- a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged server installation.md +++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.md @@ -1,4 +1,4 @@ -# Packaged server installation +# Packaged version for Linux This is essentially Trilium sources + node modules + node.js runtime packaged into one 7z file. ## Steps diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Docker Server Installation.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.md similarity index 97% rename from docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Docker Server Installation.md rename to docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.md index 53d0d9dd2a..593cd7c844 100644 --- a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Docker Server Installation.md +++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.md @@ -1,4 +1,4 @@ -# Docker Server Installation +# Using Docker Official docker images are published on docker hub for **AMD64**, **ARMv7** and **ARM64/v8**: [https://hub.docker.com/r/triliumnext/notes/](https://hub.docker.com/r/triliumnext/notes/) ## Prerequisites @@ -50,7 +50,7 @@ Trilium requires a directory on the host system to store its data. This director #### Local Access Only -Run the container to make it accessible only from the localhost. This setup is suitable for testing or when using a proxy server like Nginx or Apache. +Run the container to make it accessible only from the localhost. This setup is suitable for testing or when using a prox ay server like Nginx or Apache. ``` sudo docker run -t -i -p 127.0.0.1:8080:8080 -v ~/trilium-data:/home/node/trilium-data triliumnext/notes:[VERSION] diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Kubernetes server installation.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Kubernetes.md similarity index 98% rename from docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Kubernetes server installation.md rename to docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Kubernetes.md index 8444cc185c..c6ee42d19e 100644 --- a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Kubernetes server installation.md +++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Kubernetes.md @@ -1,4 +1,4 @@ -# Kubernetes server installation +# Using Kubernetes As Trilium can be run in Docker it also can be deployed in Kubernetes. You can either use our Helm chart, a community Helm chart, or roll your own Kubernetes deployment. The recommended way is to use a Helm chart. diff --git a/docs/User Guide/User Guide/Installation & Setup/Upgrading TriliumNext.md b/docs/User Guide/User Guide/Installation & Setup/Upgrading TriliumNext.md index 32509cd7cf..0894837095 100644 --- a/docs/User Guide/User Guide/Installation & Setup/Upgrading TriliumNext.md +++ b/docs/User Guide/User Guide/Installation & Setup/Upgrading TriliumNext.md @@ -5,7 +5,7 @@ This document outlines the steps required to upgrade Trilium to a new release ve Trilium does not support built-in automatic upgrades; all updates must be performed manually. The upgrade process varies depending on the installation method: -* [**Docker Server Installation**](Server%20Installation/1.%20Installing%20the%20server/Docker%20Server%20Installation.md): Pull the new image and restart the container. +* [**Docker Server Installation**](Server%20Installation/1.%20Installing%20the%20server/Using%20Docker.md): Pull the new image and restart the container. * **Other Installations**: Download the latest version from the [release page](https://github.com/TriliumNext/Notes/releases/latest) and replace the existing application files. ## Database Compatibility and Migration diff --git a/src/public/app/doc_notes/en/User Guide/!!!meta.json b/src/public/app/doc_notes/en/User Guide/!!!meta.json index bb7c409443..fcdd6840fc 100644 --- a/src/public/app/doc_notes/en/User Guide/!!!meta.json +++ b/src/public/app/doc_notes/en/User Guide/!!!meta.json @@ -236,7 +236,7 @@ "Dgg7bR3b6K9j", "3tW6mORuTHnB" ], - "title": "Packaged server installation", + "title": "Packaged version for Linux", "notePosition": 10, "prefix": null, "isExpanded": false, @@ -263,10 +263,17 @@ "value": "packaged-server-installation", "isInheritable": false, "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-tux", + "isInheritable": false, + "position": 30 } ], "format": "html", - "dataFileName": "Packaged server installation.html", + "dataFileName": "Packaged version for Linux.html", "attachments": [] }, { @@ -279,7 +286,7 @@ "Dgg7bR3b6K9j", "rWX5eY045zbE" ], - "title": "Docker Server Installation", + "title": "Using Docker", "notePosition": 20, "prefix": null, "isExpanded": false, @@ -306,10 +313,17 @@ "value": "docker-server-installation", "isInheritable": false, "position": 30 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-docker", + "isInheritable": false, + "position": 40 } ], "format": "html", - "dataFileName": "Docker Server Installation.html", + "dataFileName": "Using Docker.html", "attachments": [] }, { @@ -322,7 +336,7 @@ "Dgg7bR3b6K9j", "moVgBcoxE3EK" ], - "title": "NixOS server installation", + "title": "On NixOS", "notePosition": 30, "prefix": null, "isExpanded": false, @@ -335,10 +349,17 @@ "value": "nixos-server-installation", "isInheritable": false, "position": 10 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-tux", + "isInheritable": false, + "position": 20 } ], "format": "html", - "dataFileName": "NixOS server installation.html", + "dataFileName": "On NixOS.html", "attachments": [] }, { @@ -351,7 +372,7 @@ "Dgg7bR3b6K9j", "J1Bb6lVlwU5T" ], - "title": "Manual server installation", + "title": "Manually", "notePosition": 40, "prefix": null, "isExpanded": false, @@ -371,10 +392,31 @@ "value": "manual-server-installation", "isInheritable": false, "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-code-alt", + "isInheritable": false, + "position": 30 + }, + { + "type": "relation", + "name": "internalLink", + "value": "rWX5eY045zbE", + "isInheritable": false, + "position": 40 + }, + { + "type": "relation", + "name": "internalLink", + "value": "3tW6mORuTHnB", + "isInheritable": false, + "position": 50 } ], "format": "html", - "dataFileName": "Manual server installation.html", + "dataFileName": "Manually.html", "attachments": [] }, { @@ -387,7 +429,7 @@ "Dgg7bR3b6K9j", "DCmT6e7clMoP" ], - "title": "Kubernetes server installation", + "title": "Using Kubernetes", "notePosition": 50, "prefix": null, "isExpanded": false, @@ -400,10 +442,81 @@ "value": "kubernetes-server-installation", "isInheritable": false, "position": 10 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-kubernetes", + "isInheritable": false, + "position": 20 } ], "format": "html", - "dataFileName": "Kubernetes server installation.html", + "dataFileName": "Using Kubernetes.html", + "attachments": [] + }, + { + "isClone": false, + "noteId": "klCWNks3ReaQ", + "notePath": [ + "pOsGYCXsbNQG", + "Otzi9La2YAUX", + "WOcw2SLH6tbX", + "Dgg7bR3b6K9j", + "klCWNks3ReaQ" + ], + "title": "Multiple server instances", + "notePosition": 60, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "relation", + "name": "internalLink", + "value": "cbkrhQjrkKrh", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "3tW6mORuTHnB", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "rWX5eY045zbE", + "isInheritable": false, + "position": 30 + }, + { + "type": "relation", + "name": "internalLink", + "value": "moVgBcoxE3EK", + "isInheritable": false, + "position": 40 + }, + { + "type": "relation", + "name": "internalLink", + "value": "J1Bb6lVlwU5T", + "isInheritable": false, + "position": 50 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxs-user-account", + "isInheritable": false, + "position": 60 + } + ], + "format": "html", + "dataFileName": "Multiple server instances.html", "attachments": [] } ] diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manual server installation.html b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html similarity index 76% rename from src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manual server installation.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html index 3aa1347d51..a2e3dbdc6b 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manual server installation.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html @@ -5,16 +5,21 @@ - Manual server installation + Manually
-

Manual server installation

+

Manually

-

This page describes manually installing Trilium on your server. Note that this is a not well supported way to install Trilium, problems may appear, information laid out here is quite out of date. It is recommended to use either Docker or packaged build installation. -

+

Requirements

Trilium is a node.js application. Supported (tested) version of node.js is latest 14.X.X and 16.X.X. Trilium might work with older versions as diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Multiple server instances.html b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Multiple server instances.html new file mode 100644 index 0000000000..8c835e0be6 --- /dev/null +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Multiple server instances.html @@ -0,0 +1,42 @@ + + + + + + + + Multiple server instances + + + +

+

Multiple server instances

+ +
+

Trilium does not support multiple users. In order to have two or more + persons with their own set of notes, multiple server instances must be + set up. It is also not possible to use multiple sync servers.

+

To allow multiple server instances on a single physical server:

+
    +
  • +

    For Packaged version for Linux or  + Manually, if starting the server manually just specify a different + port and data directory per instance:

    TRILIUM_NETWORK_PORT=8080 TRILIUM_DATA_DIR=/path/to/your/data-dir-A /opt/trilium/trilium.sh
    +

    For a second instance:

    TRILIUM_NETWORK_PORT=8081 TRILIUM_DATA_DIR=/path/to/your/data-dir-B /opt/trilium/trilium.sh
    +

    If using systemd, then set the environment variables in the service configuration.

    +

     

    +
    • +
  • For Using Docker, + simply use two different containers, each with their own port binding and + data directory.
    • +
  • For On NixOS, + the only possible way is to use Docker OCI containers or at least one NixOS + container with its own service definition.
    • +
+

For support or additional context, see the related GitHub Discussion.

+
+
+ + + \ No newline at end of file diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/NixOS server installation.html b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/On NixOS.html similarity index 91% rename from src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/NixOS server installation.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/On NixOS.html index 42a8825962..d77e076abe 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/NixOS server installation.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/On NixOS.html @@ -5,12 +5,12 @@ - NixOS server installation + On NixOS
-

NixOS server installation

+

On NixOS

This page describes configuring the Trilium module included in NixOS.

diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged server installation.html b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html similarity index 96% rename from src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged server installation.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html index bca16d20a4..57cfa4168c 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged server installation.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html @@ -5,12 +5,12 @@ - Packaged server installation + Packaged version for Linux
-

Packaged server installation

+

Packaged version for Linux

This is essentially Trilium sources + node modules + node.js runtime packaged diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Docker Server Installation.html b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html similarity index 94% rename from src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Docker Server Installation.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html index 8d136add54..1ce6b7dc11 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Docker Server Installation.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html @@ -5,12 +5,12 @@ - Docker Server Installation + Using Docker

-

Docker Server Installation

+

Using Docker

Official docker images are published on docker hub for AMD64, ARMv7 and ARM64/v8: @@ -51,8 +51,8 @@

Running the Docker Container

Local Access Only

Run the container to make it accessible only from the localhost. This - setup is suitable for testing or when using a proxy server like Nginx or - Apache.

sudo docker run -t -i -p 127.0.0.1:8080:8080 -v ~/trilium-data:/home/node/trilium-data triliumnext/notes:[VERSION]
+ setup is suitable for testing or when using a prox ay server like Nginx + or Apache.

sudo docker run -t -i -p 127.0.0.1:8080:8080 -v ~/trilium-data:/home/node/trilium-data triliumnext/notes:[VERSION]
  1. Verify the container is running using docker ps.
  2. Access Trilium via a web browser at 127.0.0.1:8080.
    3. diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Kubernetes server installation.html b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Kubernetes.html similarity index 95% rename from src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Kubernetes server installation.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Kubernetes.html index bc2f06ae38..4bef270675 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Kubernetes server installation.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Kubernetes.html @@ -5,12 +5,12 @@ - Kubernetes server installation + Using Kubernetes
    -

    Kubernetes server installation

    +

    Using Kubernetes

    As Trilium can be run in Docker it also can be deployed in Kubernetes. diff --git a/src/public/app/doc_notes/en/User Guide/navigation.html b/src/public/app/doc_notes/en/User Guide/navigation.html index 499344d916..a928ef545c 100644 --- a/src/public/app/doc_notes/en/User Guide/navigation.html +++ b/src/public/app/doc_notes/en/User Guide/navigation.html @@ -19,20 +19,23 @@