Commit bdb19ae6 authored by Marin Jankovski's avatar Marin Jankovski Committed by Marin Jankovski

Merge branch 'fix-ci-migration-docs' into 'master'

Add missing rake and change nginx config for CI migration

/cc @marin

See merge request !1385
parent 9b6cebf9
...@@ -62,7 +62,7 @@ database configuration files: ...@@ -62,7 +62,7 @@ database configuration files:
# Manual installation # Manual installation
cd /home/gitlab_ci/gitlab-ci 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 # Omnibus installation
sudo gitlab-ci-rake backup:create sudo gitlab-ci-rake backup:create
...@@ -72,7 +72,7 @@ database configuration files: ...@@ -72,7 +72,7 @@ database configuration files:
# Manual installation # Manual installation
cd /home/gitlab_ci/gitlab-ci 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 # Omnibus installation
sudo gitlab-ci-rake backup:create MYSQL_TO_POSTGRESQL=1 sudo gitlab-ci-rake backup:create MYSQL_TO_POSTGRESQL=1
...@@ -262,18 +262,6 @@ server { ...@@ -262,18 +262,6 @@ 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;
......
...@@ -18,18 +18,6 @@ server { ...@@ -18,18 +18,6 @@ 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