From 9c1687f8f2517516607b78659374ac2a749d0bae Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 22 May 2026 16:54:29 +0900 Subject: [PATCH] bekkalokk/vaultwarden: use envvar keys It seems like the nixpkgs module is compensating for previous config that might've ended up in a file, which are now being turned into screaming snake case environment variables. Let's just name them as they are supposed to be named instead of having the upstream module translate them. --- hosts/bekkalokk/services/vaultwarden.nix | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/hosts/bekkalokk/services/vaultwarden.nix b/hosts/bekkalokk/services/vaultwarden.nix index f552c69..dc6d0f1 100644 --- a/hosts/bekkalokk/services/vaultwarden.nix +++ b/hosts/bekkalokk/services/vaultwarden.nix @@ -16,30 +16,30 @@ in { dbBackend = "postgresql"; environmentFile = config.sops.secrets."vaultwarden/environ".path; config = { - domain = "https://${domain}"; + DOMAIN = "https://${domain}"; - rocketAddress = address; - rocketPort = port; + ROCKET_ADDRESS = address; + ROCKET_PORT = port; - websocketEnabled = true; - websocketAddress = address; - websocketPort = wsPort; + WEBSOCKET_ENABLED = true; + WEBSOCKET_ADDRESS = address; + WEBSOCKET_PORT = wsPort; - signupsAllowed = true; - signupsVerify = true; - signupsDomainsWhitelist = "pvv.ntnu.no"; + SIGNUPS_ALLOWED = true; + SIGNUPS_VERIFY = true; + SIGNUPS_DOMAINS_WHITELIST = "pvv.ntnu.no"; - smtpFrom = "vaultwarden@pvv.ntnu.no"; - smtpFromName = "VaultWarden PVV"; + SMTP_FROM = "vaultwarden@pvv.ntnu.no"; + SMTP_FROM_NAME = "VaultWarden PVV"; - smtpHost = "smtp.pvv.ntnu.no"; - smtpUsername = "vaultwarden"; - smtpSecurity = "force_tls"; - smtpAuthMechanism = "Login"; + SMTP_HOST = "smtp.pvv.ntnu.no"; + SMTP_USERNAME = "vaultwarden"; + SMTP_SECURITY = "force_tls"; + SMTP_AUTH_MECHANISM = "Login"; # Configured in environ: - # databaseUrl = "postgresql://vaultwarden@/vaultwarden"; - # smtpPassword = hemli + # DATABASE_URL = "postgresql://vaultwarden@/vaultwarden"; + # SMTP_PASSWORD = hemli }; };