# HG changeset patch # User Marin Jankovski <maxlazio@gmail.com> # Date 1421645676 28800 # Sun Jan 18 21:34:36 2015 -0800 # Node ID 5811368abfce0dcc8ee49394fbf0ca6f019dc5dd # Parent 67d1dfd6b2ce51e6b8de9a5fe8d135fbc2499245 Add to readme changes regarding CI integration. diff --git a/doc/gitlab-ci/README.md b/doc/gitlab-ci/README.md --- a/doc/gitlab-ci/README.md +++ b/doc/gitlab-ci/README.md @@ -20,6 +20,15 @@ After you run `sudo gitlab-ctl reconfigure`, your GitLab CI Coordinator should now be reachable at `http://ci.example.com`. +Follow the on screen instructions on how to generate the app id and secret. +Once generated, add them to `/etc/gitlab/gitlab.rb` + +``` +gitlab_ci['gitlab_server'] = { 'url' => 'http://gitlab.example.com', 'app_id' => "1234", 'app_secret' => 'qwertyuio'} +``` + +and run `sudo gitlab-ctl reconfigure` again. + ## Running GitLab CI on its own server If you want to run GitLab and GitLab CI Coordinator on two separate servers you @@ -33,7 +42,7 @@ ci_external_url 'http://ci.example.com' # Tell GitLab CI to integrate with gitlab.example.com -gitlab_ci['gitlab_server_urls'] = ['http://gitlab.example.com'] +gitlab_ci['gitlab_server'] = { 'url' => 'http://gitlab.example.com', 'app_id' => "1234", 'app_secret' => 'qwertyuio'} # Shut down GitLab services on the CI server unicorn['enable'] = false