Skip to content
Snippets Groups Projects
Commit cc5cbd3c authored by Amy Qualls's avatar Amy Qualls
Browse files

Merge branch '5745-fix-workhorse-socket-in-docs' into 'master'

Fix location of workhorse socket in documentation

Closes #5745

See merge request gitlab-org/omnibus-gitlab!4681
parents 965d0d4b 7b45517e
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -598,12 +598,15 @@ exists, for reconfigure to succeed.
 
### Vhost (server block)
 
NOTE: **Note:**
GitLab 13.5 changed the default workhorse socket location from `/var/opt/gitlab/gitlab-workhorse/socket` to `/var/opt/gitlab/gitlab-workhorse/sockets/socket`. Please update the following configuration accordingly if upgrading from versions older than 13.5.
Then, in your custom Passenger/NGINX installation, create the following site
configuration file:
 
```plaintext
upstream gitlab-workhorse {
server unix://var/opt/gitlab/gitlab-workhorse/socket fail_timeout=0;
server unix://var/opt/gitlab/gitlab-workhorse/sockets/socket fail_timeout=0;
}
 
server {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment