Commit fd11e307b64f

Vincent Demeester <vincent@sbr.pm>
2026-04-12 22:06:45
fix(carthage): merge duplicate systemd.tmpfiles.rules
Consolidated git directory tmpfiles rules into the existing systemd.tmpfiles.rules block to fix duplicate attribute error that prevented evaluation.
main
1 parent 3928f38
Changed files (1)
systems
carthage
extra.nix
systems/carthage/extra.nix
@@ -208,6 +208,11 @@ in
   # Flux — website generator (hourly)
   systemd.tmpfiles.rules = [
     "d /var/lib/flux 0755 vincent users -"
+    # Git directory permissions (for Caddy access to public repos)
+    "d /home/vincent 0711 vincent users -" # Allow traversal to git directory
+    "d /home/vincent/git 0700 vincent users -" # Private git directory
+    "d /home/vincent/git/public 0755 vincent users -" # Public repositories only
+    "d /var/log/git-builds 0755 vincent users -" # Git build logs
   ];
 
   systemd.services.flux-generate = {
@@ -431,13 +436,7 @@ in
     mode = "0755";
   };
 
-  # Setup permissions for git directories (via systemd tmpfiles)
-  systemd.tmpfiles.rules = [
-    "d /home/vincent 0711 vincent users -" # Allow traversal to git directory
-    "d /home/vincent/git 0700 vincent users -" # Private git directory
-    "d /home/vincent/git/public 0755 vincent users -" # Public repositories only
-    "d /var/log/git-builds 0755 vincent users -" # Git build logs
-  ];
+  # Git directory permissions are set in the systemd.tmpfiles.rules above (with flux)
 
   # Disable TPM2 (VPS has no TPM hardware)
   security.tpm2.enable = lib.mkForce false;