From c4ad7a89a4e2e6bafc0d70e7486593c7f2f750bb Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Thu, 28 Sep 2023 17:00:26 -0700
Subject: [PATCH] Refer to the file in the dir

---
 dkim.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dkim.nix b/dkim.nix
index 780e121..91ff914 100644
--- a/dkim.nix
+++ b/dkim.nix
@@ -25,15 +25,15 @@ let
     concatStringsSep "\n" (map (ensureDomainDkimCert keyDir) domains);
 
   makeKeyTable = keyDir: domains:
-    pkgs.writeTextDir "dkim-tables/key.table" (concatStringsSep "\n"
+    pkgs.writeTextDir "key.table" (concatStringsSep "\n"
       (map (dom: "${dom}:mail:${keyDir}/${dom}.mail.key") domains));
 
   makeSigningTable = domains:
-    pkgs.writeTextDir "dkim-tables/signing.table"
+    pkgs.writeTextDir "signing.table"
     (concatStringsSep "\n" (map (dom: "${dom} ${dom}") domains));
 
-  keyTable = makeKeyTable cfg.state-directory cfg.domains;
-  signingTable = makeSigningTable cfg.domains;
+  keyTableDir = makeKeyTable cfg.state-directory cfg.domains;
+  signingTableDir = makeSigningTable cfg.domains;
 
 in {
   options.fudo.mail.dkim = with types; {
@@ -99,8 +99,8 @@ in {
       in pkgs.writeText "opendkim.conf" ''
         Canonicalization relaxed/simple
         Socket inet:${toString cfg.port}
-        KeyTable file: ${keyTable}
-        SigningTable file:${signingTable}
+        KeyTable file: ${keyTableDir}/key.table
+        SigningTable file:${signingTableDir}/signing.table
         ${optionalString cfg.debug debugString}
       '';
     };
@@ -118,7 +118,7 @@ in {
               (ensureAllDkimCerts cfg.state-directory cfg.domains))
           ];
           ReadWritePaths = [ cfg.state-directory ];
-          ReadOnlyPaths = [ (dirOf keyTable) (dirOf signingTable) ];
+          ReadOnlyPaths = [ keyTableDir signingTableDir ];
         };
       };
     };