From 3c2e24df1cb4a80481fa2c123fa910692c4f21a2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 28 May 2022 12:19:51 +0200
Subject: acl: run mkdir, skip /

---
 krebs/3modules/acl.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/acl.nix b/krebs/3modules/acl.nix
index 9cdbb6cff..d23706499 100644
--- a/krebs/3modules/acl.nix
+++ b/krebs/3modules/acl.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }: let
   parents = dir:
     if dir == "/" then
-      [ dir ]
+      []
     else
       [ dir ] ++ parents (builtins.dirOf dir)
     ;
@@ -40,13 +40,16 @@ in {
         pkgs.coreutils
       ];
       serviceConfig = {
-        ExecStart = pkgs.writers.writeDash "acl" (lib.concatStrings (
-          lib.mapAttrsToList (_: rule: ''
-            setfacl -${lib.optionalString rule.recursive "R"}m ${rule.rule} ${path}
-            ${lib.optionalString rule.default "setfacl -${lib.optionalString rule.recursive "R"}dm ${rule.rule} ${path}"}
-            ${lib.optionalString rule.parents (lib.concatMapStringsSep "\n" (folder: "setfacl -m ${rule.rule} ${folder}") (parents path))}
-          '') rules
-        ));
+        ExecStart = pkgs.writers.writeDash "acl" ''
+          mkdir -p "${path}"
+          ${lib.concatStrings (
+            lib.mapAttrsToList (_: rule: ''
+              setfacl -${lib.optionalString rule.recursive "R"}m ${rule.rule} ${path}
+              ${lib.optionalString rule.default "setfacl -${lib.optionalString rule.recursive "R"}dm ${rule.rule} ${path}"}
+              ${lib.optionalString rule.parents (lib.concatMapStringsSep "\n" (folder: "setfacl -m ${rule.rule} ${folder}") (parents (builtins.dirOf path)))}
+            '') rules
+          )}
+        '';
         RemainAfterExit = true;
         Type = "simple";
       };
-- 
cgit v1.2.3