diff options
| author | Toon Claes <toon@gitlab.com> | 2022-06-20 16:15:22 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-06-20 16:15:22 +0300 |
| commit | bcf5c14eda9a96cb1001aae8bd76183e6ed1420d (patch) | |
| tree | 934411b5987cc013b35aad9496b64c1eed7d056c | |
| parent | f7a2a6eb46f60e79f2272745ddedcb23e39588af (diff) | |
| parent | 3c37bfdc1bb29ac00ad8879d5b48624a3c480fb6 (diff) | |
Merge branch 'sh-enable-fips-mode-gitaly-ruby' into 'master'
Use FIPS-compliant encryption for gitaly-ruby in FIPS mode
See merge request gitlab-org/gitaly!4645
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 8 | ||||
| -rwxr-xr-x | ruby/bin/gitaly-ruby | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 787e705f9..7037e215f 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.21.1' +gem 'gitlab-labkit', '~> 0.23' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 3616864ad..f8688dbb5 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -65,11 +65,11 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.21.2) + gitlab-labkit (0.23.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - grpc (~> 1.30) - jaeger-client (~> 1.1) + grpc (>= 1.37) + jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) @@ -231,7 +231,7 @@ DEPENDENCIES github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.10.gitlab.2) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.21.1) + gitlab-labkit (~> 0.23) gitlab-license_finder gitlab-markup (~> 1.7.1) google-protobuf (~> 3.19.0) diff --git a/ruby/bin/gitaly-ruby b/ruby/bin/gitaly-ruby index c0f17b1e5..7ec113674 100755 --- a/ruby/bin/gitaly-ruby +++ b/ruby/bin/gitaly-ruby @@ -31,6 +31,8 @@ def main FileUtils.mkdir_p(socket_dir) File.chmod(0700, socket_dir) + Labkit::FIPS.enable_fips_mode! if Labkit::FIPS.enabled? + set_rugged_search_path load_distributed_tracing |