Add latest changes from gitlab-org/gitlab@13-12-stable-ee
This commit is contained in:
parent
e1c4542b0f
commit
01ca8e9ec4
|
|
@ -688,7 +688,7 @@ gitlab_path=/home/git/gitlab
|
|||
gitaly_path=/home/git/gitaly
|
||||
|
||||
sudo -u git -H sh -c "$gitlab_path/bin/daemon_with_pidfile $gitlab_path/tmp/pids/gitaly.pid \
|
||||
$gitaly_path/gitaly $gitaly_path/config.toml >> $gitlab_path/log/gitaly.log 2>&1 &"
|
||||
$gitaly_path/_build/bin/gitaly $gitaly_path/config.toml >> $gitlab_path/log/gitaly.log 2>&1 &"
|
||||
```
|
||||
|
||||
### Initialize Database and Activate Advanced Features
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ start_gitlab() {
|
|||
echo "Gitaly is already running with pid $gapid, not restarting"
|
||||
else
|
||||
$app_root/bin/daemon_with_pidfile $gitaly_pid_path \
|
||||
$gitaly_dir/gitaly $gitaly_dir/config.toml >> $gitaly_log 2>&1 &
|
||||
$gitaly_dir/_build/bin/gitaly $gitaly_dir/config.toml >> $gitaly_log 2>&1 &
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue