diff options
author | Rémy Coutable <remy@rymai.me> | 2018-01-29 11:27:00 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-01-29 11:27:00 +0000 |
commit | 44fceaf80ace3ff63b332481e6329901bf092116 (patch) | |
tree | 6cf06d8b71b1edd0148d1eb89f2b4b6a9c2458be | |
parent | cb7a2938d644a2a5f922392a88adc896748d3baa (diff) | |
parent | 9fe6cabc993b9fb876875ef6b1058b4c6471c939 (diff) | |
download | gitlab-ce-44fceaf80ace3ff63b332481e6329901bf092116.tar.gz |
Merge branch 'improve_nginx_confs' into 'master'
Improve Nginx configuration files
See merge request gitlab-org/gitlab-ce!16605
-rw-r--r-- | lib/support/nginx/gitlab | 4 | ||||
-rw-r--r-- | lib/support/nginx/gitlab-ssl | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index 54f51d9d633..0e27a28ea6e 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -17,6 +17,8 @@ ## See installation.md#using-https for additional HTTPS configuration details. 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; } @@ -110,6 +112,8 @@ server { error_page 502 /502.html; error_page 503 /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; internal; } diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index ed8131ef24f..8218d68f9ba 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -21,6 +21,8 @@ ## See installation.md#using-https for additional HTTPS configuration details. 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; } @@ -160,6 +162,8 @@ server { error_page 502 /502.html; error_page 503 /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; internal; } |