From 30705191eff625bd5eb8d3d868e90bbd932ffc50 Mon Sep 17 00:00:00 2001
From: Praveen Arimbrathodiyil <praveen@debian.org>
Date: Mon, 15 Feb 2016 23:03:46 +0530
Subject: [PATCH] fix pid path mismatch

---
 debian/conf/gitlab                  |  3 +++
 debian/conf/gitlab-mailroom.service |  2 +-
 debian/conf/gitlab-sidekiq.service  |  2 +-
 debian/conf/gitlab-unicorn.service  |  2 +-
 debian/patches/pid-log-paths.patch  | 16 ++++++++++++++++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/conf/gitlab b/debian/conf/gitlab
index 8427837a18..6cc2d33fb6 100755
--- a/debian/conf/gitlab
+++ b/debian/conf/gitlab
@@ -59,6 +59,9 @@ mail_room_enabled=false
 # The default is "$pid_path/mail_room.pid"
 mail_room_pid_path="$pid_path/mail_room.pid"
 
+# mail_room_logfile defines log file used by mailroom
+mail_room_logfile="${gitlab_log_dir}/mail_room.log"
+
 # shell_path defines the path of shell for "$app_user" in case you are using
 # shell other than "bash"
 # The default is "/bin/bash"
diff --git a/debian/conf/gitlab-mailroom.service b/debian/conf/gitlab-mailroom.service
index bddb63220f..ffde0a7e8a 100644
--- a/debian/conf/gitlab-mailroom.service
+++ b/debian/conf/gitlab-mailroom.service
@@ -20,7 +20,7 @@ RuntimeDirectory=gitlab
 RuntimeDirectoryMode=2750
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
 SyslogIdentifier=gitlab-mailroom
-PIDFile=/run/gitlab/gitlab-mailroom.pid
+PIDFile=/run/gitlab/mail_room.pid
 Type=oneshot
 RemainAfterExit=yes
 
diff --git a/debian/conf/gitlab-sidekiq.service b/debian/conf/gitlab-sidekiq.service
index 67121de476..791f13391f 100644
--- a/debian/conf/gitlab-sidekiq.service
+++ b/debian/conf/gitlab-sidekiq.service
@@ -21,7 +21,7 @@ RuntimeDirectory=gitlab
 RuntimeDirectoryMode=2750
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
 SyslogIdentifier=gitlab-sidekiq
-PIDFile=/run/gitlab/gitlab-sidekiq.pid
+PIDFile=/run/gitlab/sidekiq.pid
 
 ExecStart=/bin/sh bin/background_jobs start
 ExecStop=/bin/sh bin/background_jobs stop
diff --git a/debian/conf/gitlab-unicorn.service b/debian/conf/gitlab-unicorn.service
index 867736a362..10c3b4e8b3 100644
--- a/debian/conf/gitlab-unicorn.service
+++ b/debian/conf/gitlab-unicorn.service
@@ -20,7 +20,7 @@ RuntimeDirectory=gitlab
 RuntimeDirectoryMode=2750
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
 SyslogIdentifier=gitlab-unicorn
-PIDFile=/run/gitlab/gitlab-unicorn.pid
+PIDFile=/run/gitlab/unicorn.pid
 
 ExecStart=/bin/sh bin/web start
 ExecStop=/bin/sh bin/web stop
diff --git a/debian/patches/pid-log-paths.patch b/debian/patches/pid-log-paths.patch
index d5549dc801..dd0ebc40b9 100644
--- a/debian/patches/pid-log-paths.patch
+++ b/debian/patches/pid-log-paths.patch
@@ -32,3 +32,19 @@ Index: gitlab/bin/web
  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)