summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-05-29 09:25:04 +0000
committerDouwe Maan <douwe@gitlab.com>2017-05-29 09:25:04 +0000
commitc9e9c2ffaac773ef85267e558fe345171d2ce979 (patch)
treed36f3d8015267822f6bef109bc503874fd3272a6
parente5226177ac667c8ad4cc07270bbdef24031eb8a2 (diff)
parent39c6dd5b935d79c424bb16ed40d41c06d56a47cf (diff)
downloadgitlab-ce-c9e9c2ffaac773ef85267e558fe345171d2ce979.tar.gz
Merge branch 'gitaly-init-default' into 'master'
Duplicate gitaly init variables in 'default' file Closes #31858 See merge request !11738
-rw-r--r--lib/support/init.d/gitlab.default.example2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example
index 9472c3c992f..b341b5a0309 100644
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
@@ -87,4 +87,6 @@ shell_path="/bin/bash"
# This variable controls whether the init script starts/stops Gitaly
gitaly_enabled=false
+gitaly_dir=$(cd $app_root/../gitaly 2> /dev/null && pwd)
+gitaly_pid_path="$pid_path/gitaly.pid"
gitaly_log="$app_root/log/gitaly.log"