diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2016-08-09 12:27:37 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2016-08-09 12:27:37 +0200 |
| commit | 7a99826694ccc9dc5fd5f8cbecf7b51f8d690de4 (patch) | |
| tree | e58828158e6a818e82a0a7cda95b642998233d77 /lib/support/nginx/gitlab-ssl | |
| parent | 71952d057d5edad0697d7da76f5da034689e0f4a (diff) | |
| parent | 551ffc0a4d25a381e9f8f6a8d6f2793bb87f3145 (diff) | |
| download | gitlab-ce-7a99826694ccc9dc5fd5f8cbecf7b51f8d690de4.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-grack-lfs
Diffstat (limited to 'lib/support/nginx/gitlab-ssl')
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index 0b93d7f292f..bf014b56cf6 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -93,12 +93,7 @@ server { proxy_http_version 1.1; - ## By overwriting Host and clearing X-Forwarded-Host we ensure that - ## internal HTTP redirects generated by GitLab always send users to - ## YOUR_SERVER_FQDN. - proxy_set_header Host YOUR_SERVER_FQDN; - proxy_set_header X-Forwarded-Host ""; - + proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Ssl on; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; |