diff options
| author | 3kami3 <github@yumimix.org> | 2017-03-03 22:20:29 +0900 |
|---|---|---|
| committer | 3kami3 <github@yumimix.org> | 2017-03-03 22:20:29 +0900 |
| commit | 79c3ace80b690c9ccc2d6190fcf1f14f735f566c (patch) | |
| tree | 5e37b57ea335fed94b59b86f7824fba2db6d187e /lib | |
| parent | 1bc5dab7b4f2650b5afb7c0e4c70e5ac9f66eba0 (diff) | |
| download | gitlab-ce-79c3ace80b690c9ccc2d6190fcf1f14f735f566c.tar.gz | |
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9623#note_24573655
Fixed issues pointed out.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/support/nginx/gitlab | 3 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index 78f28347d1a..f25e66d54c8 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -42,7 +42,8 @@ server { ## http://nginx.org/en/docs/http/ngx_http_realip_module.html real_ip_header X-Real-IP; ## X-Real-IP or X-Forwarded-For or proxy_protocol real_ip_recursive off; ## If you enable 'on' - set_real_ip_from YOUR_TRUSTED_ADDRESS; ## Replace this with something like 192.168.1.0/24 + ## If you have a trusted IP address, uncomment it and set it + # set_real_ip_from YOUR_TRUSTED_ADDRESS; ## Replace this with something like 192.168.1.0/24 ## Individual nginx logs for this GitLab vhost access_log /var/log/nginx/gitlab_access.log; diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index 1bccb1c2451..67dac676e49 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -86,7 +86,8 @@ server { ## http://nginx.org/en/docs/http/ngx_http_realip_module.html real_ip_header X-Real-IP; ## X-Real-IP or X-Forwarded-For or proxy_protocol real_ip_recursive off; ## If you enable 'on' - set_real_ip_from YOUR_TRUSTED_ADDRESS; ## Replace this with something like 192.168.1.0/24 + ## If you have a trusted IP address, uncomment it and set it + # set_real_ip_from YOUR_TRUSTED_ADDRESS; ## Replace this with something like 192.168.1.0/24 ## Individual nginx logs for this GitLab vhost access_log /var/log/nginx/gitlab_access.log; |