gitlab-shell: fix config path finding

and remove TimeoutSec for gitlab
This commit is contained in:
Robin Gloster
2018-03-22 02:29:27 +01:00
parent fa347164b6
commit 31d77fd4f3
3 changed files with 6 additions and 25 deletions
+2 -1
View File
@@ -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