From 39c6dd5b935d79c424bb16ed40d41c06d56a47cf Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 26 May 2017 16:30:45 +0200 Subject: 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. --- lib/support/init.d/gitlab.default.example | 2 ++ 1 file changed, 2 insertions(+) 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" -- cgit v1.2.1