From 69e6734eb7010ba5463ffeae91e850b286cccd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 9 Aug 2023 15:37:03 +0300
Subject: [PATCH] nsd-acme: misc fixes

---
 modules/services/nsd-acme/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/nsd-acme/default.nix b/modules/services/nsd-acme/default.nix
index c38b5d6..11fe21d 100644
--- a/modules/services/nsd-acme/default.nix
+++ b/modules/services/nsd-acme/default.nix
@@ -123,18 +123,18 @@ in {
             path = [pkgs.openssh pkgs.nsd];
             preStart = ''
               mkdir -p "$STATE_DIRECTORY/private"
-              ln -sf "$CREDENTIALS_DIRECTORY/letsenctypt-account.key" \
+              ln -sf "$CREDENTIALS_DIRECTORY/letsencrypt-account-key" \
                 "$STATE_DIRECTORY/private/key.pem"
             '';
             serviceConfig = {
               ExecStart = let
                 hook = mkHook zone;
-                days = "--days ${builtins.toString cfg.days}";
+                days = builtins.toString cfg.days;
                 staging =
                   if cfg.staging
                   then "--staging"
                   else "";
-              in "${pkgs.uacme} --verbose --days ${days} --hook ${hook} ${staging} issue ${zone}";
+              in "${pkgs.uacme}/bin/uacme -c \"$STATE_DIRECTORY\" --verbose --days ${days} --hook ${hook} ${staging} issue ${zone}";
               DynamicUser = "yes";
               StateDirectory = "nsd-acme/${sanitized}";
               RuntimeDirectory = "nsd-acme/${sanitized}";
@@ -145,7 +145,7 @@ in {
                 "nsd_control.pem:${rc.controlCertFile}"
                 "nsd_server.key:${rc.serverKeyFile}"
                 "nsd_server.pem:${rc.serverCertFile}"
-                "letsencrypt-account.key:${cfg.accountKey}"
+                "letsencrypt-account-key:${cfg.accountKey}"
               ];
             };
           }