[DRE-commits] [gitlab] 01/01: fix hard-coded path for workhorse

[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 77c535494fe46d064535e83cb03fe182d08ffa86
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Dec 17 20:19:00 2015 +0530

    fix hard-coded path for workhorse
---
 debian/patches/0300-no-hard-coded-workhorse-path.patch | 13 +++++++++++++
 debian/patches/series                                  |  1 +
 2 files changed, 14 insertions(+)

diff --git a/debian/patches/0300-no-hard-coded-workhorse-path.patch b/debian/patches/0300-no-hard-coded-workhorse-path.patch
new file mode 100644
index 0000000..aa8d4b7
--- /dev/null
+++ b/debian/patches/0300-no-hard-coded-workhorse-path.patch
@@ -0,0 +1,13 @@
+Index: gitlab/lib/support/init.d/gitlab
+===================================================================
+--- gitlab.orig/lib/support/init.d/gitlab
++++ gitlab/lib/support/init.d/gitlab
+@@ -237,7 +237,7 @@ start_gitlab() {
+   else
+     # No need to remove a socket, gitlab-workhorse does this itself
+     $app_root/bin/daemon_with_pidfile $gitlab_workhorse_pid_path  \
+-      $app_root/../gitlab-workhorse/gitlab-workhorse \
++      gitlab-workhorse \
+         $gitlab_workhorse_options \
+       >> $gitlab_workhorse_log 2>&1 &
+   fi
diff --git a/debian/patches/series b/debian/patches/series
index 810c04b..1b3638d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ loosen-rails-version.patch
 0107-relax-omniauth-facebook.patch
 0200-rails-4.2.patch
 source-init-functions.patch
+0300-no-hard-coded-workhorse-path.patch

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