From 871b6fb81edd6db447b2993a8849830871b5e6e9 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Mon, 24 Mar 2025 12:45:07 -0400 Subject: [PATCH] Goldwarden --- clients/quadraticserver/conduwuit.nix | 10 +++++----- clients/quadraticserver/vaultwarden.nix | 3 ++- modules/desktop/goldwarden.nix | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 modules/desktop/goldwarden.nix diff --git a/clients/quadraticserver/conduwuit.nix b/clients/quadraticserver/conduwuit.nix index a037c94..61b951a 100644 --- a/clients/quadraticserver/conduwuit.nix +++ b/clients/quadraticserver/conduwuit.nix @@ -2,11 +2,6 @@ networking.firewall.allowedTCPPorts = [8448]; services = { - caddy.virtualHosts."matrix.henryhiles.com" = { - serverAliases = ["matrix.henryhiles.com:8448"]; - extraConfig = "reverse_proxy unix//run/conduwuit/socket"; - }; - conduwuit = { enable = true; group = "caddy"; @@ -15,5 +10,10 @@ unix_socket_path = "/run/conduwuit/socket"; }; }; + + caddy.virtualHosts."matrix.henryhiles.com" = { + serverAliases = ["matrix.henryhiles.com:8448"]; + extraConfig = "reverse_proxy unix//run/conduwuit/socket"; + }; }; } diff --git a/clients/quadraticserver/vaultwarden.nix b/clients/quadraticserver/vaultwarden.nix index a1762bf..599c520 100644 --- a/clients/quadraticserver/vaultwarden.nix +++ b/clients/quadraticserver/vaultwarden.nix @@ -5,10 +5,11 @@ config = { domain = "https://vaultwarden.henryhiles.com"; signupsAllowed = false; - rocketAddress = "127.0.0.1"; passwordHintsAllowed = false; + rocketAddress = "127.0.0.1"; }; }; + caddy.virtualHosts."vaultwarden.henryhiles.com".extraConfig = "reverse_proxy 127.0.0.1:8000"; }; } diff --git a/modules/desktop/goldwarden.nix b/modules/desktop/goldwarden.nix new file mode 100644 index 0000000..b72370a --- /dev/null +++ b/modules/desktop/goldwarden.nix @@ -0,0 +1 @@ +{programs.goldwarden.enable = true;}