summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-05-26 16:30:45 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-05-26 16:30:45 +0200
commit39c6dd5b935d79c424bb16ed40d41c06d56a47cf (patch)
tree77aaf50e4d61bfb537e646af69507e53366e675b
parent827fd03483e73ddbd5abe75ceeedfbcdef2a4820 (diff)
downloadgitlab-ce-39c6dd5b935d79c424bb16ed40d41c06d56a47cf.tar.gz
Duplicate gitaly init variables in 'default' file
This is needed because these variables depend (directly or indirectly) on the 'app_root' variable which can be changed in the default file. If app_root has a non-standard value, the value of e.g. gitaly_dir generated in the init script becomes invalid.
-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"