public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74379 from bachp/gitlab-runner-reload

Browse Source 
nixos/gitlab-runner: reload on config change
This commit is contained in:
Florian Klink 2020-03-31 20:18:28 +02:00 committed by GitHub
commit 9faea55282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/continuous-integration/gitlab-runner.nix
View File

@ -120,10 +120,16 @@ in
++ optional hasDocker "docker.service"; ++ optional hasDocker "docker.service";
requires = optional hasDocker "docker.service"; requires = optional hasDocker "docker.service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
reloadIfChanged = true;
restartTriggers = [
config.environment.etc."gitlab-runner/config.toml".source
];
serviceConfig = { serviceConfig = {
StateDirectory = "gitlab-runner";
ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \ ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
--working-directory ${cfg.workDir} \ --working-directory ${cfg.workDir} \
--config ${configFile} \ --config /etc/gitlab-runner/config.toml \
--service gitlab-runner \ --service gitlab-runner \
--user gitlab-runner \ --user gitlab-runner \
''; '';
@ -138,6 +144,9 @@ in
# Make the gitlab-runner command availabe so users can query the runner # Make the gitlab-runner command availabe so users can query the runner
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
# Make sure the config can be reloaded on change
environment.etc."gitlab-runner/config.toml".source = configFile;
users.users.gitlab-runner = { users.users.gitlab-runner = {
group = "gitlab-runner"; group = "gitlab-runner";
extraGroups = optional hasDocker "docker"; extraGroups = optional hasDocker "docker";