about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorFelix Bühler <Stunkymonkey@users.noreply.github.com>2024-03-24 17:06:01 +0100
committerGitHub <noreply@github.com>2024-03-24 17:06:01 +0100
commit63078e346817f586c3d3b791822d5a756725ccb8 (patch)
treeba131249784adfd44a70aa7e0d05461ae44f2550 /nixos/modules/services
parenta9a3ea33b666758058d001edcc809b9a2bb3ff44 (diff)
parentaf6e25787827e25a87bb874362ad380a2cfab199 (diff)
downloadnixlib-63078e346817f586c3d3b791822d5a756725ccb8.tar
nixlib-63078e346817f586c3d3b791822d5a756725ccb8.tar.gz
nixlib-63078e346817f586c3d3b791822d5a756725ccb8.tar.bz2
nixlib-63078e346817f586c3d3b791822d5a756725ccb8.tar.lz
nixlib-63078e346817f586c3d3b791822d5a756725ccb8.tar.xz
nixlib-63078e346817f586c3d3b791822d5a756725ccb8.tar.zst
nixlib-63078e346817f586c3d3b791822d5a756725ccb8.zip
Merge pull request #298168 from ambroisie/improve-tandoor-recipes-manage
 nixos/tandoor-recipes: improve manage script
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/misc/tandoor-recipes.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix
index a8300ecd5233..1b1fde78ad0a 100644
--- a/nixos/modules/services/misc/tandoor-recipes.nix
+++ b/nixos/modules/services/misc/tandoor-recipes.nix
@@ -20,7 +20,10 @@ let
   manage = pkgs.writeShellScript "manage" ''
     set -o allexport # Export the following env vars
     ${lib.toShellVars env}
-    exec ${pkg}/bin/tandoor-recipes "$@"
+    eval "$(${config.systemd.package}/bin/systemctl show -pUID,GID,MainPID tandoor-recipes.service)"
+    exec ${pkgs.util-linux}/bin/nsenter \
+      -t $MainPID -m -S $UID -G $GID \
+      ${pkg}/bin/tandoor-recipes "$@"
   '';
 in
 {
@@ -82,6 +85,7 @@ in
         Restart = "on-failure";
 
         User = "tandoor_recipes";
+        Group = "tandoor_recipes";
         DynamicUser = true;
         StateDirectory = "tandoor-recipes";
         WorkingDirectory = "/var/lib/tandoor-recipes";