From 78421c8838cf0fd734e39f063893330bb3e8001f Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sat, 22 Feb 2025 20:50:35 +0300 Subject: [PATCH] fix: set acme group properly --- modules/acme/default.nix | 11 +++++++---- modules/mail/default.nix | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/acme/default.nix b/modules/acme/default.nix index 896a83c..9ddd324 100644 --- a/modules/acme/default.nix +++ b/modules/acme/default.nix @@ -1,9 +1,12 @@ -{ config, ... }: let +{ config, lib, ... }: let inherit (config.networking) domain; + inherit (lib) mkValue; in { - secrets.acmeEnvironment.file = ./environment.age; + options.acmeGroup = mkValue "nginx"; - security.acme = { + config.secrets.acmeEnvironment.file = ./environment.age; + + config.security.acme = { acceptTerms = true; defaults = { @@ -15,7 +18,7 @@ in { certs.${domain} = { extraDomainNames = [ "*.${domain}" ]; - group = "nginx"; + group = config.acmeGroup; }; }; } diff --git a/modules/mail/default.nix b/modules/mail/default.nix index 5d89de8..19c1886 100644 --- a/modules/mail/default.nix +++ b/modules/mail/default.nix @@ -16,6 +16,8 @@ in { paths = [ config.mailserver.dkimKeyDirectory config.mailserver.mailDirectory ]; }; + acmeGroup = "mail"; + mailserver = enabled { fqdn = mkDefault fqdn;