[DRE-commits] [gitlab] 02/17: set pid_path and socket_path

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit be482dd9d0080665a66d515bb0a844d2ee253aab
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Feb 13 17:57:09 2016 +0530

    set pid_path and socket_path
---
 debian/conf/gitlab | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/conf/gitlab b/debian/conf/gitlab
index 57ccaf6..288be9d 100755
--- a/debian/conf/gitlab
+++ b/debian/conf/gitlab
@@ -19,14 +19,16 @@ app_user=${gitlab_user}
 # The default is "/home/$app_user/gitlab"
 app_root=${gitlab_home}
 
+# gitlab_log_dir is defined in /etc/gitlab/gitlab-debian.conf
+
 # pid_path defines a folder in which the gitlab and it's components place their pids.
 # This variable is also used below to define the relevant pids for the gitlab components.
 # The default is "$app_root/tmp/pids"
-pid_path="$app_root/tmp/pids"
+pid_path="${gitlab_pid_path}/pids"
 
 # socket_path defines the folder in which gitlab places the sockets
 #The default is "$app_root/tmp/sockets"
-socket_path="$app_root/tmp/sockets"
+socket_path="${gitlab_pid_path}/sockets"
 
 # web_server_pid_path defines the path in which to create the pid file fo the web_server
 # The default is "$pid_path/unicorn.pid"
@@ -36,15 +38,17 @@ web_server_pid_path="$pid_path/unicorn.pid"
 # The default is "$pid_path/sidekiq.pid"
 sidekiq_pid_path="$pid_path/sidekiq.pid"
 
+# sidekiq_logfile defines log file used by sidekiq
+sidekiq_logfile="${gitlab_log_dir}/sidekiq.log"
+
 gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
 # The -listenXxx settings determine where gitlab-workhorse
 # listens for connections from NGINX. To listen on localhost:8181, write
 # '-listenNetwork tcp -listenAddr localhost:8181'.
 # The -authBackend setting tells gitlab-workhorse where it can reach
 # Unicorn.
-gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr
-$socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080"
-gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log"
+gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080"
+gitlab_workhorse_log="${gitlab_log_dir}/gitlab-workhorse.log"
 
 # mail_room_enabled specifies whether mail_room, which is used to process incoming email, is enabled.
 # This is required for the Reply by email feature.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git