BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
548b7ce8
Commit
548b7ce8
authored
Sep 22, 2015
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-ci-migration-docs' into 'master'
Add missing rake and change nginx config for CI migration /cc @marin See merge request !1385
parents
eb5fd3f8
156ace47
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
26 deletions
+2
-26
README.md
doc/migrate_ci_to_ce/README.md
+2
-14
gitlab_ci
lib/support/nginx/gitlab_ci
+0
-12
No files found.
doc/migrate_ci_to_ce/README.md
View file @
548b7ce8
...
...
@@ -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
;
...
...
lib/support/nginx/gitlab_ci
View file @
548b7ce8
...
...
@@ -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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment