diff options
| author | Melroy van den Berg <webmaster1989@gmail.com> | 2018-01-21 16:39:45 +0000 |
|---|---|---|
| committer | Melroy van den Berg <melroy@melroy.org> | 2018-01-26 00:10:54 +0100 |
| commit | 9fe6cabc993b9fb876875ef6b1058b4c6471c939 (patch) | |
| tree | f556004628cedc3b809bfb6318f5178dc1d791cb /lib | |
| parent | ba02e3a5dfb0fb95a1a32b81e893b6fe2ea39b9e (diff) | |
| download | gitlab-ce-9fe6cabc993b9fb876875ef6b1058b4c6471c939.tar.gz | |
Add omnibus remarks
Diffstat (limited to 'lib')
| -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; } |