diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 16:54:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 16:54:15 +0300 |
| commit | be834a25982746ffd85252ff502df42bb88cb9d5 (patch) | |
| tree | b4d6a8ba0931e12fac08f05abea33a3b8ec2c8a2 /config/initializers/0_license.rb | |
| parent | ee925a3597f27e92f83a50937a64068109675b3d (diff) | |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32
Diffstat (limited to 'config/initializers/0_license.rb')
| -rw-r--r-- | config/initializers/0_license.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb index e7b46a14630..ce3103be2e4 100644 --- a/config/initializers/0_license.rb +++ b/config/initializers/0_license.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true Gitlab.ee do - public_key_file = File.read(Rails.root.join(".license_encryption_key.pub")) + prefix = ENV['GITLAB_LICENSE_MODE'] == 'test' ? 'test_' : '' + public_key_file = File.read(Rails.root.join(".#{prefix}license_encryption_key.pub")) public_key = OpenSSL::PKey::RSA.new(public_key_file) Gitlab::License.encryption_key = public_key rescue |