[DRE-commits] [gitlab] 04/17: read variables in bin/*

[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 d8e19a4295364b337f364b0ccf6ab84a3604d0aa
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Feb 13 17:59:45 2016 +0530

    read variables in bin/*
---
 debian/patches/pid-log-paths.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/pid-log-paths.patch b/debian/patches/pid-log-paths.patch
new file mode 100644
index 0000000..d5549dc
--- /dev/null
+++ b/debian/patches/pid-log-paths.patch
@@ -0,0 +1,34 @@
+Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415
+
+Index: gitlab/bin/background_jobs
+===================================================================
+--- gitlab.orig/bin/background_jobs
++++ gitlab/bin/background_jobs
+@@ -6,6 +6,11 @@ sidekiq_pidfile="$app_root/tmp/pids/side
+ sidekiq_logfile="$app_root/log/sidekiq.log"
+ gitlab_user=$(ls -l config.ru | awk '{print $3}')
+ 
++# Read configuration variable file if it is present
++test -f /etc/default/gitlab && . /etc/default/gitlab
++
++sidekiq_pidfile=${sidekiq_pid_path}
++
+ warn()
+ {
+   echo "$@" 1>&2
+Index: gitlab/bin/web
+===================================================================
+--- gitlab.orig/bin/web
++++ gitlab/bin/web
+@@ -7,6 +7,11 @@ unicorn_pidfile="$app_root/tmp/pids/unic
+ unicorn_config="$app_root/config/unicorn.rb"
+ unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV"
+ 
++# Read configuration variable file if it is present
++test -f /etc/default/gitlab && . /etc/default/gitlab
++
++unicorn_pidfile=${web_server_pid_path}
++
+ get_unicorn_pid()
+ {
+   local pid=$(cat $unicorn_pidfile)
diff --git a/debian/patches/series b/debian/patches/series
index ab8a6fd..36675eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 0102-loosen-octokit.patch
 0108-make-mysql-optional.patch
 source-init-functions.patch
+pid-log-paths.patch

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