summaryrefslogtreecommitdiff
path: root/metrics_server/metrics_server.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-29 21:09:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-29 21:09:23 +0000
commitab593c8ded443f7ade3540ff8dac69ee51bc74fd (patch)
tree1fb8b2e194747f135d8610cd4b77766ac458b3a7 /metrics_server/metrics_server.rb
parent860efb35e24e07a1a22bcafcddb5f0409d40354c (diff)
downloadgitlab-ce-ab593c8ded443f7ade3540ff8dac69ee51bc74fd.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'metrics_server/metrics_server.rb')
-rw-r--r--metrics_server/metrics_server.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/metrics_server/metrics_server.rb b/metrics_server/metrics_server.rb
index a5c448b5105..d1a64aa5b79 100644
--- a/metrics_server/metrics_server.rb
+++ b/metrics_server/metrics_server.rb
@@ -56,6 +56,11 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass
env['GME_LOG_LEVEL'] = 'quiet'
end
+ if settings['tls_enabled']
+ env['GME_CERT_FILE'] = settings['tls_cert_path']
+ env['GME_CERT_KEY'] = settings['tls_key_path']
+ end
+
Process.spawn(env, cmd, err: $stderr, out: $stdout, pgroup: true).tap do |pid|
Process.detach(pid)
end