summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-12 18:55:42 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-12 18:55:42 +0300
commit72d3d67a1825f73d8ff5399c76aa6cdd5369c7af (patch)
tree8136c216dc473a0fcad7ea99464d7c10a3113371 /lib
parentcbb44b9da3e7288200485caed7a9716013e34984 (diff)
parent25ee53c3aea763f794948947a6f4c4fd422bbf7b (diff)
downloadgitlab-ce-72d3d67a1825f73d8ff5399c76aa6cdd5369c7af.tar.gz
Merge pull request #7712 from bbodenmiller/patch-1
set fail_timeout=0 as recommended by Unicorn
Diffstat (limited to 'lib')
-rw-r--r--lib/support/nginx/gitlab2
-rw-r--r--lib/support/nginx/gitlab-ssl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 16b06fe006e..49a68c62293 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -28,7 +28,7 @@
##
upstream gitlab {
- server unix:/home/git/gitlab/tmp/sockets/gitlab.socket;
+ server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0;
}
## Normal HTTP host
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index d2aa06fe7f6..19409e41f40 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -34,7 +34,7 @@
## See installation.md#using-https for additional HTTPS configuration details.
upstream gitlab {
- server unix:/home/git/gitlab/tmp/sockets/gitlab.socket;
+ server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0;
}
## Normal HTTP host