Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415

Index: gitlab/bin/background_jobs
===================================================================
--- gitlab.orig/bin/background_jobs
+++ gitlab/bin/background_jobs
@@ -7,6 +7,11 @@ sidekiq_logfile="$app_root/log/sidekiq.l
 sidekiq_config="$app_root/config/sidekiq_queues.yml"
 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)
Index: gitlab/bin/mail_room
===================================================================
--- gitlab.orig/bin/mail_room
+++ gitlab/bin/mail_room
@@ -7,6 +7,11 @@ mail_room_pidfile="$app_root/tmp/pids/ma
 mail_room_logfile="$app_root/log/mail_room.log"
 mail_room_config="$app_root/config/mail_room.yml"
 
+# Read configuration variable file if it is present
+test -f /etc/default/gitlab && . /etc/default/gitlab
+
+mail_room_logfile=${mail_room_pid_path}
+
 get_mail_room_pid()
 {
   local pid=$(cat $mail_room_pidfile)