[packages/gitlab-ce] use gitlab-workhorse

glen glen at pld-linux.org
Sun Sep 4 13:52:16 CEST 2016


commit 9ce88a2e027f07f1774d06c13109c1e9429283c6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 4 14:21:07 2016 +0300

    use gitlab-workhorse
    
    fixes empty clones over http protocol
    https://gitlab.com/gitlab-org/gitlab-ce/issues/2727

 gitlab-ce.spec | 3 ++-
 nginx.conf     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 71c3ee4..aa8b9fb 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -17,7 +17,7 @@
 Summary:	A Web interface to create projects and repositories, manage access and do code reviews
 Name:		gitlab-ce
 Version:	8.11.4
-Release:	0.71
+Release:	0.72
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -55,6 +55,7 @@ Requires(post,preun):	/sbin/chkconfig
 Requires:	apache-base
 Requires:	git-core >= 2.7.4
 Requires:	gitlab-shell >= 3.4.0
+Requires:	gitlab-workhorse >= 0.7.11
 Requires:	nodejs
 Requires:	rc-scripts
 Requires:	ruby-bundler
diff --git a/nginx.conf b/nginx.conf
index f6e2f8c..ca5659a 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -8,7 +8,7 @@
 ###################################
 
 upstream gitlab-workhorse {
-	server unix:/var/run/gitlab/gitlab.socket;
+	server unix:/var/run/gitlab/gitlab-workhorse.socket fail_timeout=0;
 }
 
 server {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/9ce88a2e027f07f1774d06c13109c1e9429283c6



More information about the pld-cvs-commit mailing list