diff options
| author | Robin Gloster <mail@glob.in> | 2018-03-19 21:52:36 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-03-22 02:29:27 +0100 |
| commit | 31d77fd4f3d009631e0dc4361bfc0648fadcce4a (patch) | |
| tree | fee8f4637472b6e887b50c2ed32e65da9bdd3257 /nixos | |
| parent | fa347164b607df52768fd952d56bd42a90fc9a6a (diff) | |
| download | nixlib-31d77fd4f3d009631e0dc4361bfc0648fadcce4a.tar nixlib-31d77fd4f3d009631e0dc4361bfc0648fadcce4a.tar.gz nixlib-31d77fd4f3d009631e0dc4361bfc0648fadcce4a.tar.bz2 nixlib-31d77fd4f3d009631e0dc4361bfc0648fadcce4a.tar.lz nixlib-31d77fd4f3d009631e0dc4361bfc0648fadcce4a.tar.xz nixlib-31d77fd4f3d009631e0dc4361bfc0648fadcce4a.tar.zst nixlib-31d77fd4f3d009631e0dc4361bfc0648fadcce4a.zip | |
gitlab-shell: fix config path finding
and remove TimeoutSec for gitlab
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 9ed5875a0191..76d892b16815 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -500,7 +500,7 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}"; @@ -580,6 +580,7 @@ in { ln -sf ${cfg.statePath}/log /run/gitlab/log ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp + ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml chown -R ${cfg.user}:${cfg.group} /run/gitlab # Prepare home directory |