diff --git a/hosts/vps/modules/services/caddy.nix b/hosts/vps/modules/services/caddy.nix index 9742a42..2c369b4 100644 --- a/hosts/vps/modules/services/caddy.nix +++ b/hosts/vps/modules/services/caddy.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, ... }: { services.caddy = { @@ -6,17 +6,20 @@ # zipline virtualHosts."i.toast.name".extraConfig = '' - reverse_proxy http://127.0.0.1:3000 + reverse_proxy http://127.0.0.1:${toString config.services.zipline.settings.CORE_PORT} ''; # forgejo virtualHosts."git.toast.name".extraConfig = '' - reverse_proxy http://127.0.0.1:3001 + reverse_proxy http://127.0.0.1:${toString config.services.forgejo.settings.server.HTTP_PORT} ''; - # vaultwarden + # tailscale virtualHosts."vps.curl-pence.ts.net".extraConfig = '' - reverse_proxy /vaultwarden/* http://127.0.0.1:8222 + reverse_proxy /vaultwarden/* http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT} + handle_path /trilium/* { + reverse_proxy http://127.0.0.1:${toString config.services.trilium-server.port} + } ''; }; } diff --git a/hosts/vps/modules/services/default.nix b/hosts/vps/modules/services/default.nix index ef12686..53755a6 100644 --- a/hosts/vps/modules/services/default.nix +++ b/hosts/vps/modules/services/default.nix @@ -6,5 +6,6 @@ ./zipline.nix ./caddy.nix ./forgejo.nix + ./trilium-server.nix ]; } diff --git a/hosts/vps/modules/services/trilium-server.nix b/hosts/vps/modules/services/trilium-server.nix new file mode 100644 index 0000000..3a6fc5e --- /dev/null +++ b/hosts/vps/modules/services/trilium-server.nix @@ -0,0 +1,7 @@ +{ + services.trilium-server = { + enable = true; + host = "127.0.0.1"; + port = 8080; + }; +}