diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /lib/support | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'lib/support')
-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 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; } |