diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-06 09:23:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-06 09:23:23 +0000 |
| commit | de035a0d5e310b99d5ae3c2dd74949897377d8a1 (patch) | |
| tree | 6d4cdc323fc0e6a530d15c20832936e7dd687408 /config | |
| parent | e3ff410152edbd0ac2c5bba3e69b3eefaee3aac7 (diff) | |
| parent | 26eadca48cc58e53e5e060efe6424f63377c7663 (diff) | |
| download | gitlab-ce-de035a0d5e310b99d5ae3c2dd74949897377d8a1.tar.gz | |
Merge branch 'fix/update-doorkeeper-openid-connect' into 'master'
Upgrade doorkeeper-openid_connect
See merge request gitlab-org/gitlab-ce!14372
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/doorkeeper_openid_connect.rb | 2 | ||||
| -rw-r--r-- | config/initializers/secret_token.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/doorkeeper_openid_connect.rb b/config/initializers/doorkeeper_openid_connect.rb index c58f425b19b..af174def047 100644 --- a/config/initializers/doorkeeper_openid_connect.rb +++ b/config/initializers/doorkeeper_openid_connect.rb @@ -1,7 +1,7 @@ Doorkeeper::OpenidConnect.configure do issuer Gitlab.config.gitlab.url - jws_private_key Rails.application.secrets.jws_private_key + signing_key Rails.application.secrets.openid_connect_signing_key resource_owner_from_access_token do |access_token| User.active.find_by(id: access_token.resource_owner_id) diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index f9c1d2165d3..750a5b34f3b 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -25,7 +25,7 @@ def create_tokens secret_key_base: file_secret_key || generate_new_secure_token, otp_key_base: env_secret_key || file_secret_key || generate_new_secure_token, db_key_base: generate_new_secure_token, - jws_private_key: generate_new_rsa_private_key + openid_connect_signing_key: generate_new_rsa_private_key } missing_secrets = set_missing_keys(defaults) |