Commit cac96922 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'fix-nginx' into 'master'

Add missing proxy requests to migration docs

See merge request !1317
parents b39b1564 50e59509
...@@ -222,6 +222,18 @@ You need to edit `/etc/nginx/sites-available/gitlab_ci` and paste: ...@@ -222,6 +222,18 @@ You need to edit `/etc/nginx/sites-available/gitlab_ci` and paste:
resolver 8.8.8.8 8.8.4.4; resolver 8.8.8.8 8.8.4.4;
proxy_pass $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri; proxy_pass $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri;
} }
# expose build endpoint to allow trigger builds
location ~ ^/projects/\d+/build$ {
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_redirect off;
proxy_set_header X-Real-IP $remote_addr;
# You need to specify your DNS servers that are able to resolve YOUR_GITLAB_SERVER_FQDN
resolver 8.8.8.8 8.8.4.4;
proxy_pass $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri;
}
# redirect all other CI requests # redirect all other CI requests
location / { location / {
......
...@@ -18,6 +18,18 @@ server { ...@@ -18,6 +18,18 @@ server {
proxy_pass $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri; proxy_pass $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri;
} }
# expose build endpoint to allow trigger builds
location ~ ^/projects/\d+/build$ {
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_redirect off;
proxy_set_header X-Real-IP $remote_addr;
# You need to specify your DNS servers that are able to resolve YOUR_GITLAB_SERVER_FQDN
resolver 8.8.8.8 8.8.4.4;
proxy_pass $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri;
}
# redirect all other CI requests # redirect all other CI requests
location / { location / {
return 301 $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri; return 301 $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment