diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-21 17:38:37 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-21 17:38:37 +0100 |
| commit | 9832e60ffb801427453301c6da4675f81518cdeb (patch) | |
| tree | dc8e1b7692be8cde7e57b7059de23385e177beed /config/gitlab.yml.example | |
| parent | e209ba7002238459b56ced1f5b4a7ce8bd6e2b8b (diff) | |
| parent | 7fc2422c8d660d310b819b2b6ffbca9a9e4d8cd6 (diff) | |
| download | gitlab-ce-9832e60ffb801427453301c6da4675f81518cdeb.tar.gz | |
Merge branch 'tduehr/gitlab-ce-cas-support'
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index db378118f85..fcf034d7911 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -287,6 +287,15 @@ production: &base # arguments, followed by optional 'args' which can be either a hash or an array. # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html providers: + # See omniauth-cas3 for more configuration details + # - { name: 'cas3', + # label: 'cas3', + # args: { + # url: 'https://sso.example.com', + # disable_ssl_verification: false, + # login_url: '/cas/login', + # service_validate_url: '/cas/p3/serviceValidate', + # logout_url: '/cas/logout'} } # - { name: 'github', # app_id: 'YOUR_APP_ID', # app_secret: 'YOUR_APP_SECRET', @@ -324,6 +333,10 @@ production: &base # application_name: 'YOUR_APP_NAME', # application_password: 'YOUR_APP_PASSWORD' } } + # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours. + # cas3: + # session_duration: 28800 + # Shared file storage settings shared: # path: /mnt/gitlab # Default: shared |
