nixos/github-runner: use specifier to get abs runtime path

This commit is contained in:
Vincent Haupert 2021-03-27 16:37:13 +01:00
parent 91bf483f87
commit fcfa809fe6
No known key found for this signature in database
GPG key ID: A8B605E96F82B4E4

View file

@ -3,9 +3,10 @@ with lib;
let
cfg = config.services.github-runner;
svcName = "github-runner";
systemdUser = "${svcName}-${cfg.name}";
systemdDir = "${svcName}/${cfg.name}";
systemdUser = "${svcName}-${cfg.user}";
runnerRoot = "/run/${systemdDir}"; # RuntimeDirectory=
# %t: Runtime directory root (usually /run); see systemd.unit(5)
runtimeDir = "%t/${systemdDir}";
in
{
options.services.github-runner = {
@ -111,8 +112,8 @@ in
after = [ "network.target" ];
environment = {
HOME = runnerRoot;
RUNNER_ROOT = runnerRoot;
HOME = runtimeDir;
RUNNER_ROOT = runtimeDir;
};
path = (with pkgs; [
@ -241,7 +242,7 @@ in
# Home of persistent runner data, e.g., credentials
StateDirectory = [ systemdDir ];
StateDirectoryMode = "0700";
WorkingDirectory = runnerRoot;
WorkingDirectory = runtimeDir;
# By default, use a dynamically allocated user
DynamicUser = true;