mirror of
https://github.com/zadam/trilium.git
synced 2025-12-23 16:49:58 +01:00
chore(docs): solve import/export errors
This commit is contained in:
@@ -9,6 +9,7 @@ I've assumed you have created a DNS A record for `trilium.yourdomain.com` that y
|
||||
```
|
||||
|
||||
2. Configure Apache proxy and websocket proxy
|
||||
|
||||
1. Enable apache proxy modules
|
||||
|
||||
```
|
||||
@@ -56,8 +57,11 @@ I've assumed you have created a DNS A record for `trilium.yourdomain.com` that y
|
||||
```
|
||||
|
||||
4. Enable the virtual host with `sudo a2ensite trilium.yourdomain.com.conf`
|
||||
|
||||
5. Reload apache2 with `sudo systemctl reload apache2`
|
||||
|
||||
3. Create and enable a systemd service to start the docker container on boot
|
||||
|
||||
1. Create a new empty file called `/lib/systemd/system/trilium.service` with the contents
|
||||
|
||||
```
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
# Nginx
|
||||
# Nginx
|
||||
Configure Nginx proxy and HTTPS. The operating system here is Ubuntu 18.04.
|
||||
|
||||
1. Download Nginx and remove Apache2
|
||||
|
||||
```sh
|
||||
```bash
|
||||
sudo apt-get install nginx
|
||||
sudo apt-get remove apache2
|
||||
```
|
||||
|
||||
2. Create configure file
|
||||
1. Create configure file
|
||||
|
||||
```sh
|
||||
```bash
|
||||
cd /etc/nginx/conf.d
|
||||
vim default.conf
|
||||
```
|
||||
|
||||
3. Fill the file with the context shown below, part of the setting show be changed. Then you can enjoy your web with HTTPS forced and proxy.
|
||||
1. Fill the file with the context shown below, part of the setting show be changed. Then you can enjoy your web with HTTPS forced and proxy.
|
||||
|
||||
```conf
|
||||
```nginx
|
||||
# This part is for proxy and HTTPS configure
|
||||
server {
|
||||
listen 443 ssl;
|
||||
|
||||
@@ -20,9 +20,13 @@ TOTP (Time-Based One-Time Password) is a security feature that generates a uniqu
|
||||
### TOTP
|
||||
|
||||
1. Start Trilium Notes normally.
|
||||
|
||||
2. Go to "Menu" -> "Options" -> "MFA"
|
||||
|
||||
3. Click the "Generate TOTP Secret" button
|
||||
|
||||
4. Copy the generated secret to your authentication app/extension
|
||||
|
||||
5. Set an environment variable "TOTP\_SECRET" as the generated secret. Environment variables can be set with a .env file in the root directory, by defining them in the command line, or with a docker container.
|
||||
|
||||
```
|
||||
@@ -43,10 +47,15 @@ TOTP (Time-Based One-Time Password) is a security feature that generates a uniqu
|
||||
```
|
||||
|
||||
6. Restart Trilium
|
||||
|
||||
7. Go to "Options" -> "MFA"
|
||||
|
||||
8. Click the "Generate Recovery Codes" button
|
||||
|
||||
9. Save the recovery codes. Recovery codes can be used once in place of the TOTP if you loose access to your authenticator. After a rerecovery code is used, it will show the unix timestamp when it was used in the MFA options tab.
|
||||
|
||||
10. Load the secret into an authentication app like google authenticator
|
||||
|
||||
|
||||
### OpenID
|
||||
|
||||
|
||||
Reference in New Issue
Block a user