summaryrefslogtreecommitdiff
path: root/lib/support
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-23 21:08:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-23 21:08:31 +0000
commite679965983c591a9f009f6356b67a844582ca1bb (patch)
tree03648473fe38e9ff4c720d4ec8c58caa048c7181 /lib/support
parent7e1e5ca371cbfe77bdf56fcf65a4e749e6e86a06 (diff)
downloadgitlab-ce-e679965983c591a9f009f6356b67a844582ca1bb.tar.gz
Add latest changes from gitlab-org/gitlab@master
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 fc984d737d5..9eafa5ef008 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -18,7 +18,7 @@
upstream gitlab-workhorse {
# GitLab socket file,
- # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
+ # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/sockets/socket
server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
}
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index ba01e250bbb..ae5c88455e4 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -22,7 +22,7 @@
upstream gitlab-workhorse {
# GitLab socket file,
- # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
+ # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/sockets/socket
server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
}