diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-09-12 19:03:10 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-09-12 19:03:10 +0200 |
| commit | 4bf24d239f1c1140405f19bfe63ffb99042f6e37 (patch) | |
| tree | a3927288f59b21e4e3e78f4bbfd0981abffdeef8 /lib | |
| parent | 29f990002c6e2704bb25ba4aa89491f319699202 (diff) | |
| parent | 5ac019946f327852d9c355bbe95de1f0c1cfad59 (diff) | |
| download | gitlab-ce-4bf24d239f1c1140405f19bfe63ffb99042f6e37.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/support/nginx/gitlab | 2 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 2 |
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 |