diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-22 09:45:52 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-22 09:45:52 +0200 |
| commit | 156ace47783097e05f855a159f6d6f43d1ec4ce0 (patch) | |
| tree | 46b4fa92badc216e4dee328b43bd913b78b76604 | |
| parent | eb5fd3f86b96c32353cc6e1d0ae2bada50209fa2 (diff) | |
| download | gitlab-ce-156ace47783097e05f855a159f6d6f43d1ec4ce0.tar.gz | |
Add missing rake and change nginx config for CI migration
| -rw-r--r-- | doc/migrate_ci_to_ce/README.md | 16 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab_ci | 12 |
2 files changed, 2 insertions, 26 deletions
diff --git a/doc/migrate_ci_to_ce/README.md b/doc/migrate_ci_to_ce/README.md index c5eb4534c70..1f050e2def2 100644 --- a/doc/migrate_ci_to_ce/README.md +++ b/doc/migrate_ci_to_ce/README.md @@ -62,7 +62,7 @@ database configuration files: # Manual installation cd /home/gitlab_ci/gitlab-ci - sudo -u gitlab_ci -H bundle exec backup:create RAILS_ENV=production + sudo -u gitlab_ci -H bundle exec rake backup:create RAILS_ENV=production # Omnibus installation sudo gitlab-ci-rake backup:create @@ -72,7 +72,7 @@ database configuration files: # Manual installation cd /home/gitlab_ci/gitlab-ci - sudo -u gitlab_ci -H bundle exec backup:create RAILS_ENV=production MYSQL_TO_POSTGRESQL=1 + sudo -u gitlab_ci -H bundle exec rake backup:create RAILS_ENV=production MYSQL_TO_POSTGRESQL=1 # Omnibus installation sudo gitlab-ci-rake backup:create MYSQL_TO_POSTGRESQL=1 @@ -262,18 +262,6 @@ 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; diff --git a/lib/support/nginx/gitlab_ci b/lib/support/nginx/gitlab_ci index ce179d6f599..bf05edfd780 100644 --- a/lib/support/nginx/gitlab_ci +++ b/lib/support/nginx/gitlab_ci @@ -18,18 +18,6 @@ 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; |