diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 13:34:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 13:34:10 +0000 |
| commit | 01ca8e9ec4b98f078a8633ec910d0bbc78446fed (patch) | |
| tree | b69f558cdad83726ce6d13f57187214573e4eae6 | |
| parent | e1c4542b0f1ad29c1f21bc17de191df99b99b1a3 (diff) | |
| download | gitlab-ce-01ca8e9ec4b98f078a8633ec910d0bbc78446fed.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
| -rw-r--r-- | doc/install/installation.md | 2 | ||||
| -rwxr-xr-x | lib/support/init.d/gitlab | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 3af3d2bfe7a..d6f8c9cedd3 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -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 diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 4fe7f0cf480..9bf8fe28120 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -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 |