From 2096e8ed00db36f73383144ca0aac9c94518969c Mon Sep 17 00:00:00 2001 From: k3t Date: Sun, 15 Mar 2026 21:55:04 -0600 Subject: [PATCH] switch to nginx --- hosts/nixcloud/services.d/caddy.nix | 14 -------------- hosts/nixcloud/services.d/vaultwarden.nix | 15 ++++++++------- 2 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 hosts/nixcloud/services.d/caddy.nix diff --git a/hosts/nixcloud/services.d/caddy.nix b/hosts/nixcloud/services.d/caddy.nix deleted file mode 100644 index 248403f..0000000 --- a/hosts/nixcloud/services.d/caddy.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, pkgs, ... }: - - -{ - services.caddy = { - enable = true; - virtualHosts."k3t.dev".extraConfig = '' - encode zstd gzip - root /var/www/k3t.dev/ - file_server browse - ''; - }; - -} diff --git a/hosts/nixcloud/services.d/vaultwarden.nix b/hosts/nixcloud/services.d/vaultwarden.nix index 10a417c..1996acc 100644 --- a/hosts/nixcloud/services.d/vaultwarden.nix +++ b/hosts/nixcloud/services.d/vaultwarden.nix @@ -7,6 +7,7 @@ # in order to avoid having ADMIN_TOKEN in the nix store it can be also set with the help of an environment file # be aware that this file must be created by hand (or via secrets management like sops) environmentFile = "/var/lib/vaultwarden/vaultwarden.env"; + configureNginx = true; config = { # Refer to https://github.com/dani-garcia/vaultwarden/blob/main/.env.template DOMAIN = "https://bitwarden.k3t.dev"; @@ -17,11 +18,11 @@ ROCKET_LOG = "critical"; }; }; - services.caddy.virtualHosts."bitwarden.k3t.dev".extraConfig = '' - encode zstd gzip - - reverse_proxy :${toString config.services.vaultwarden.config.ROCKET_PORT} { - header_up X-Real-IP {remote_host} - } - ''; + services.nginx.virtualHosts."bitwarden.k3t.dev".enableACME = true; + #services.caddy.virtualHosts."bitwarden.k3t.dev".extraConfig = '' + # encode zstd gzip + # reverse_proxy :${toString config.services.vaultwarden.config.ROCKET_PORT} { + # header_up X-Real-IP {remote_host} + # } + #''; }