movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 12:45:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nixos/modules/services/continuous-integration/github-runner.nix
View file

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