motiejus/config
1
Fork 0
Code Packages Releases Activity

zones don't need to be sanitized

Browse Source 
it's DNS!
This commit is contained in:
Motiejus Jakštys 2023-08-10 10:45:24 +03:00
parent 7bedc09abb
commit fa435f65d0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/services/nsd-acme/default.nix
View File

@ -116,10 +116,8 @@ in {
} }
// lib.mapAttrs' // lib.mapAttrs'
( (
zone: cfg: let zone: cfg:
sanitized = lib.strings.sanitizeDerivationName zone; lib.nameValuePair "nsd-acme-${zone}" {
in
lib.nameValuePair "nsd-acme-${sanitized}" {
description = "dns-01 acme update for ${zone}"; description = "dns-01 acme update for ${zone}";
path = [pkgs.openssh pkgs.nsd]; path = [pkgs.openssh pkgs.nsd];
preStart = '' preStart = ''
@ -140,7 +138,7 @@ in {
UMask = "0022"; UMask = "0022";
User = "nsd"; User = "nsd";
Group = "nsd"; Group = "nsd";
StateDirectory = "nsd-acme/${sanitized}"; StateDirectory = "nsd-acme/${zone}";
LoadCredential = ["letsencrypt-account-key:${cfg.accountKey}"]; LoadCredential = ["letsencrypt-account-key:${cfg.accountKey}"];
ReadWritePaths = ["/var/lib/nsd/acmezones"]; ReadWritePaths = ["/var/lib/nsd/acmezones"];
SuccessExitStatus = [0 1]; SuccessExitStatus = [0 1];
@ -190,7 +188,7 @@ in {
lib.mapAttrs' lib.mapAttrs'
( (
zone: cfg: zone: cfg:
lib.nameValuePair "nsd-acme-${lib.strings.sanitizeDerivationName zone}" { lib.nameValuePair "nsd-acme-${zone}" {
description = "nsd-acme for zone ${zone}"; description = "nsd-acme for zone ${zone}";
wantedBy = ["timers.target"]; wantedBy = ["timers.target"];
timerConfig = { timerConfig = {
@ -201,10 +199,12 @@ in {
) )
config.mj.services.nsd-acme.zones; config.mj.services.nsd-acme.zones;
mj.base.unitstatus.units = let mj.base.unitstatus.units =
zones = config.mj.services.nsd-acme.zones; lib.mkIf config.mj.base.unitstatus.enable
sanitized = map lib.strings.sanitizeDerivationName (lib.attrNames zones); (
in ["nsd-control-setup"]
lib.mkIf config.mj.base.unitstatus.enable (["nsd-control-setup"] ++ map (n: "nsd-acme-${n}") sanitized); ++ map (n: "nsd-acme-${n}")
(lib.attrNames config.mj.services.nsd-acme.zones)
);
}; };
} }