summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2023-01-13 11:26:52 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-01-13 11:34:11 +0000
commit910e7a15eb47757949ead8a0d9c493fdac16becc (patch)
tree64bd08713a41d8cc53253c51819c994a9ba7b1f6
parentf82c4ab6f4ad02458ce07f847936dc08d39fb00c (diff)
nixos/gitlab: set gitaly runtime dir
If `runtime_dir` is not set, gitaly will use `/tmp` as a place for sockets and packed binaries like `git2go`. If the gitlab instance does not experience much traffic and gitlay is not restarted regularly, systemd-tmpfiles will remove the binaries. This breaks some gitlab functionality until gitaly is restarted manually. (cherry picked from commit b88913fb113c5da9e1eb73d448fed2d4cfc08635)
-rw-r--r--nixos/modules/services/misc/gitlab.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index e206d5bb7c6d..69eb22f17bf0 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -40,6 +40,7 @@ let
gitalyToml = pkgs.writeText "gitaly.toml" ''
socket_path = "${lib.escape ["\""] gitalySocket}"
+ runtime_dir = "/run/gitaly"
bin_dir = "${cfg.packages.gitaly}/bin"
prometheus_listen_addr = "localhost:9236"
@@ -1353,6 +1354,7 @@ in {
TimeoutSec = "infinity";
Restart = "on-failure";
WorkingDirectory = gitlabEnv.HOME;
+ RuntimeDirectory = "gitaly";
ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}";
};
};