summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMichael Tsyganov <mikhail.tsyganov@sap.com>2018-10-08 17:32:43 +0200
committerRémy Coutable <remy@rymai.me>2018-12-05 18:17:40 +0100
commita009381380d3b63fb1c133dbe63b2557e505f4c6 (patch)
tree45a99a71db54bb9546bfd605e577591afc7d0ea2 /config
parent5f1bb1a70a6a62af3f54fad9dc650d9fbeae8423 (diff)
downloadgitlab-ce-a009381380d3b63fb1c133dbe63b2557e505f4c6.tar.gz
Support RSA and ECDSA algorithms in Omniauth JWT
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example16
1 files changed, 8 insertions, 8 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 58b7c248aaf..1c16b999e55 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -548,15 +548,15 @@ production: &base
# app_id: 'YOUR_APP_ID',
# app_secret: 'YOUR_APP_SECRET' }
# - { name: 'jwt',
- # app_secret: 'YOUR_APP_SECRET',
# args: {
- # algorithm: 'HS256',
- # uid_claim: 'email',
- # required_claims: ["name", "email"],
- # info_map: { name: "name", email: "email" },
- # auth_url: 'https://example.com/',
- # valid_within: null,
- # }
+ # secret: 'YOUR_APP_SECRET',
+ # algorithm: 'HS256', # Supported algorithms: 'RS256', 'RS384', 'RS512', 'ES256', 'ES384', 'ES512', 'HS256', 'HS384', 'HS512'
+ # uid_claim: 'email',
+ # required_claims: ['name', 'email'],
+ # info_map: { name: 'name', email: 'email' },
+ # auth_url: 'https://example.com/',
+ # valid_within: 3600 # 1 hour
+ # }
# }
# - { name: 'saml',
# label: 'Our SAML Provider',