diff options
author | Marin Jankovski <maxlazio@gmail.com> | 2015-02-13 14:49:19 -0800 |
---|---|---|
committer | Marin Jankovski <maxlazio@gmail.com> | 2015-02-13 14:49:19 -0800 |
commit | d76c5824bc05640d276be96f7853f2d266fd6750 (patch) | |
tree | c783924f16e6423e5085d0578b6614c7583b987a /doc/integration/google.md | |
parent | d0f045eb860f819a736d76622d8d9c546a9610ee (diff) | |
download | gitlab-ce-d76c5824bc05640d276be96f7853f2d266fd6750.tar.gz |
Update oauth documenatation with examples for omnibus package and installations from source.
Diffstat (limited to 'doc/integration/google.md')
-rw-r--r-- | doc/integration/google.md | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/doc/integration/google.md b/doc/integration/google.md index 7a78aff8ea4..76beac16c49 100644 --- a/doc/integration/google.md +++ b/doc/integration/google.md @@ -27,22 +27,45 @@ To enable the Google OAuth2 OmniAuth provider you must register your application - Authorized redirect URI: 'https://gitlab.example.com/users/auth/google_oauth2/callback' 1. Under the heading "Client ID for web application" you should see a Client ID and Client secret (see screenshot). Keep this page open as you continue configuration. ![Google app](google_app.png) -1. On your GitLab server, open the configuration file. +1. On your GitLab server, open the configuration file. + + For omnibus package: + + ```sh + sudo editor /etc/gitlab/gitlab.rb + ``` + + For instalations from source: ```sh - cd /home/git/gitlab + cd /home/git/gitlab - sudo -u git -H editor config/gitlab.yml + sudo -u git -H editor config/gitlab.yml ``` -1. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for more details. +1. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for inital settings. + +1. Add the provider configuration: + + For omnibus package: + + ```ruby + gitlab_rails['omniauth_providers'] = [ + { + "name" => "google_oauth2", + "app_id" => "YOUR APP ID", + "app_secret" => "YOUR APP SECRET", + "args" => { "access_type" => "offline", "approval_prompt" => '' } } + } + ] + ``` -1. Under `providers:` uncomment (or add) lines that look like the following: + For installations from source: ``` - - { name: 'google_oauth2', app_id: 'YOUR APP ID', - app_secret: 'YOUR APP SECRET', - args: { access_type: 'offline', approval_prompt: '' } } + - { name: 'google_oauth2', app_id: 'YOUR APP ID', + app_secret: 'YOUR APP SECRET', + args: { access_type: 'offline', approval_prompt: '' } } ``` 1. Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7. |