archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-25 14:08:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #803 from sameersbn/revert-nginx-config-update

Browse Source 
Revert "nginx" updated configs"
This commit is contained in:
Sameer Naik 2016-07-26 11:03:42 +05:30 committed by GitHub
commit 6dc6f485fb
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/runtime/config/nginx/gitlab
View File

@ -52,15 +52,10 @@ 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 {{GITLAB_HOST}}:{{GITLAB_PORT}};
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-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Proto {{NGINX_X_FORWARDED_PROTO}};
proxy_pass http://gitlab-workhorse;
}

9
assets/runtime/config/nginx/gitlab-ssl
View File

@ -98,16 +98,11 @@ 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 {{GITLAB_HOST}}:{{GITLAB_PORT}};
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;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Proto {{NGINX_X_FORWARDED_PROTO}};
proxy_pass http://gitlab-workhorse;
}