diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-16 20:02:49 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-16 20:02:49 +0000 |
| commit | cac969229aab74ab5dcd7682c4f1c3a74a17b9d6 (patch) | |
| tree | 4ed1ccdec2407ab1f46b3ff0f3d6caba7121101c | |
| parent | b39b156407f5ef1ea483dcd8d628d4835d02b2ff (diff) | |
| parent | 50e5950947490b58cea1a50a5be137d45d0a334c (diff) | |
| download | gitlab-ce-cac969229aab74ab5dcd7682c4f1c3a74a17b9d6.tar.gz | |
Merge branch 'fix-nginx' into 'master'
Add missing proxy requests to migration docs
See merge request !1317
| -rw-r--r-- | doc/migrate_ci_to_ce/README.md | 12 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab_ci | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/doc/migrate_ci_to_ce/README.md b/doc/migrate_ci_to_ce/README.md index e12ea9a9ad7..13efc8442d2 100644 --- a/doc/migrate_ci_to_ce/README.md +++ b/doc/migrate_ci_to_ce/README.md @@ -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; 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 location / { diff --git a/lib/support/nginx/gitlab_ci b/lib/support/nginx/gitlab_ci index bf05edfd780..ce179d6f599 100644 --- a/lib/support/nginx/gitlab_ci +++ b/lib/support/nginx/gitlab_ci @@ -18,6 +18,18 @@ server { 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 location / { return 301 $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri; |