Changeset View
Changeset View
Standalone View
Standalone View
www/gitlab/files/patch-lib_support_nginx_gitlab
| --- lib/support/nginx/gitlab.orig 2017-11-14 20:51:25 UTC | --- lib/support/nginx/gitlab.orig 2018-02-22 10:46:29 UTC | ||||
| +++ lib/support/nginx/gitlab | +++ lib/support/nginx/gitlab | ||||
| @@ -17,7 +17,7 @@ | @@ -19,7 +19,7 @@ | ||||
| ## See installation.md#using-https for additional HTTPS configuration details. | |||||
| upstream gitlab-workhorse { | upstream gitlab-workhorse { | ||||
| # Gitlab socket file, | |||||
| # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket | |||||
| - server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; | - server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; | ||||
| + server unix:/usr/local/www/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; | + server unix:/usr/local/www/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; | ||||
| } | } | ||||
| map $http_upgrade $connection_upgrade_gitlab { | map $http_upgrade $connection_upgrade_gitlab { | ||||
| @@ -110,7 +110,7 @@ server { | @@ -114,7 +114,7 @@ server { | ||||
| error_page 502 /502.html; | |||||
| error_page 503 /503.html; | |||||
| location ~ ^/(404|422|500|502|503)\.html$ { | location ~ ^/(404|422|500|502|503)\.html$ { | ||||
| # Location to the Gitlab's public directory, | |||||
| # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public. | |||||
| - root /home/git/gitlab/public; | - root /home/git/gitlab/public; | ||||
| + root /usr/local/www/gitlab/public; | + root /usr/local/www/gitlab/public; | ||||
| internal; | internal; | ||||