Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2014-09-12 13:19:38 +0400
committerBen Bodenmiller <bbodenmiller@hotmail.com>2014-09-12 13:19:38 +0400
commit25ee53c3aea763f794948947a6f4c4fd422bbf7b (patch)
tree5fcabdaecbeb468bfcc472d76ce0d95339422704 /lib/support
parent3d1a246f2c9c146d444aad68567eb06b84d82783 (diff)
fail_timeout=0 as recommended by Unicorn
Set's fail_timeout=0 as recommended by http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-timeout when Unicorn is running behind nginx.
Diffstat (limited to 'lib/support')
-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