From 85fe706794c1d9b33fa2b7810f1e3eecc5759909 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 11 Jun 2026 22:09:19 -0400 Subject: [PATCH] [marvin] remove old pocket-id config, and require agenix before voidauth --- hosts/marvin/services/auth-provider.nix | 26 ---------------------- nixosModules/services/voidauth/default.nix | 5 ++++- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/hosts/marvin/services/auth-provider.nix b/hosts/marvin/services/auth-provider.nix index 8ae918b3..5d74398e 100644 --- a/hosts/marvin/services/auth-provider.nix +++ b/hosts/marvin/services/auth-provider.nix @@ -33,32 +33,6 @@ in SMTP_USER = "auth@pyrox.dev"; }; }; - services.pocket-id = { - enable = false; - environmentFile = config.age.secrets.pocket-id-secrets.path; - settings = { - APP_URL = "https://${d.extUrl}"; - TRUST_PROXY = true; - UPDATE_CHECK_DISABLED = true; - PORT = d.port; - - # Frontend Config - UI_CONFIG_DISABLED = true; - APP_NAME = "dishNet Auth"; - SESSION_DURATION = 120; - EMAILS_VERIFIED = true; - ALLOW_OWN_ACCOUNT_EDIT = true; - DISABLE_ANIMATIONS = true; - SMTP_HOST = "smtp.purelymail.com"; - SMTP_PORT = 465; - SMTP_FROM = "auth@pyrox.dev"; - SMTP_USER = "auth@pyrox.dev"; - SMTP_TLS = "tls"; - SMTP_SKIP_CERT_VERIFY = false; - LDAP_ENABLED = false; - }; - }; - age.secrets = { pocket-id-secrets = { file = ./secrets/pocket-id-secrets.age; diff --git a/nixosModules/services/voidauth/default.nix b/nixosModules/services/voidauth/default.nix index a63399de..7f42ae81 100644 --- a/nixosModules/services/voidauth/default.nix +++ b/nixosModules/services/voidauth/default.nix @@ -248,7 +248,10 @@ in { description = "VoidAuth OIDC Server"; wantedBy = [ "multi-user.target" ]; - after = [ "postgresql.target" ]; + after = [ + "postgresql.target" + "agenix-install-secrets.service" + ]; environment = let serviceSets = lib.mergeAttrsList (map mkService cfg.declaredClients); -- 2.51.2