Use attrs for secrets instead of lists

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / tools / webhooks.nix

diff --git a/modules/private/websites/tools/tools/webhooks.nix b/modules/private/websites/tools/tools/webhooks.nix
index 8ffb81be5f9cc471eaa3617621c71e2015bd7e0d..785e22bbff2d4010bb1be6a3e9f3b39b377e6db4 100644 (file)
--- a/modules/private/websites/tools/tools/webhooks.nix
+++ b/modules/private/websites/tools/tools/webhooks.nix
@@ -1,16 +1,17 @@
 { lib, env }:
 {
-  keys = lib.attrsets.mapAttrsToList (k: v: {
-    dest = "webapps/webhooks/${k}.php";
+  keys = lib.attrsets.mapAttrs' (k: v:
+    lib.nameValuePair "webapps/webhooks/${k}.php" {
     user = "wwwrun";
     group = "wwwrun";
     permissions = "0400";
     text = v;
-  }) env ++ [{
-    dest = "webapps/webhooks";
-    isDir = true;
-    user = "wwwrun";
-    group = "wwwrun";
-    permissions = "0500";
-  }];
+  }) env // {
+    "webapps/webhooks" = {
+      isDir = true;
+      user = "wwwrun";
+      group = "wwwrun";
+      permissions = "0500";
+    };
+  };
 }