Skip to content

Commit 7327497

Browse files
Robert Marshallbalasankarc
Robert Marshall
and
balasankarc
committed
Merge branch '8217-rails-redis-tls' into 'master'
Enable GitLab to connect with Redis over TLS Closes #6628 and #8217 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7151 Merged-by: Robert Marshall <[email protected]> Approved-by: Clemens Beck <[email protected]> Approved-by: Robert Marshall <[email protected]> Reviewed-by: Balasankar 'Balu' C <[email protected]> Reviewed-by: Robert Marshall <[email protected]> Reviewed-by: Clemens Beck <[email protected]> Co-authored-by: Balasankar "Balu" C <[email protected]>
2 parents 4d91370 + 6941947 commit 7327497

File tree

12 files changed

+385
-42
lines changed

12 files changed

+385
-42
lines changed

‎config/software/gitlab-redis-cli.rb

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,17 @@
4141
echo "$1" 2>& 1
4242
}
4343
44+
set_tls_params()
45+
{
46+
REDIS_PARAMS="${REDIS_PARAMS} -p ${redis_tls_port} --tls"
47+
if [ "${redis_tls_auth_clients}" = "yes" ]; then
48+
REDIS_PARAMS="${REDIS_PARAMS} --cacertdir ${redis_tls_cacert_dir} \
49+
--cacert ${redis_tls_cacert_file} \
50+
--cert ${redis_tls_cert_file} \
51+
--key ${redis_tls_key_file}"
52+
fi
53+
}
54+
4455
gitlab_redis_cli_rc='/opt/gitlab/etc/gitlab-redis-cli-rc'
4556
4657
if ! [ -f ${gitlab_redis_cli_rc} ] || ! [ -r ${gitlab_redis_cli_rc} ] ; then
@@ -52,10 +63,16 @@
5263
5364
. "${gitlab_redis_cli_rc}"
5465
66+
5567
if [ -e "${redis_socket}" ]; then
56-
REDIS_PARAMS="-s ${redis_socket}"
68+
REDIS_PARAMS="-s ${redis_socket}"
5769
else
58-
REDIS_PARAMS="-h ${redis_host} -p ${redis_port}"
70+
REDIS_PARAMS="-h ${redis_host}"
71+
if ! [ "${redis_port}" = "0" ]; then
72+
REDIS_PARAMS="${REDIS_PARAMS} -p ${redis_port}"
73+
elif ! [ "${redis_tls_port}" = "0" ]; then
74+
set_tls_params
75+
fi
5976
fi
6077
6178
REDISCLI_AUTH="$(awk '/^requirepass /{
@@ -66,7 +83,7 @@
6683
6784
6885
if [ -n "${REDISCLI_AUTH}" ]; then
69-
export REDISCLI_AUTH
86+
export REDISCLI_AUTH
7087
fi
7188
7289
exec /opt/gitlab/embedded/bin/redis-cli $REDIS_PARAMS "$@"

‎files/gitlab-config-template/gitlab.rb.template

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,10 @@ external_url 'GENERATED_EXTERNAL_URL'
776776
# gitlab_rails['redis_password'] = nil
777777
# gitlab_rails['redis_database'] = 0
778778
# gitlab_rails['redis_enable_client'] = true
779+
# gitlab_rails['redis_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
780+
# gitlab_rails['redis_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
781+
# gitlab_rails['redis_tls_client_cert_file'] = nil
782+
# gitlab_rails['redis_tls_client_key_file'] = nil
779783

780784
#### Redis local UNIX socket (will be disabled if TCP method is used)
781785
# gitlab_rails['redis_socket'] = "/var/opt/gitlab/redis/redis.socket"
@@ -810,60 +814,100 @@ external_url 'GENERATED_EXTERNAL_URL'
810814
# gitlab_rails['redis_cache_username'] = nil
811815
# gitlab_rails['redis_cache_password'] = nil
812816
# gitlab_rails['redis_cache_cluster_nodes'] = nil
817+
# gitlab_rails['redis_cache_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
818+
# gitlab_rails['redis_cache_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
819+
# gitlab_rails['redis_cache_tls_client_cert_file'] = nil
820+
# gitlab_rails['redis_cache_tls_client_key_file'] = nil
813821
# gitlab_rails['redis_queues_instance'] = nil
814822
# gitlab_rails['redis_queues_sentinels'] = nil
815823
# gitlab_rails['redis_queues_sentinels_password'] = nil
816824
# gitlab_rails['redis_queues_username'] = nil
817825
# gitlab_rails['redis_queues_password'] = nil
818826
# gitlab_rails['redis_queues_cluster_nodes'] = nil
827+
# gitlab_rails['redis_queues_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
828+
# gitlab_rails['redis_queues_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
829+
# gitlab_rails['redis_queues_tls_client_cert_file'] = nil
830+
# gitlab_rails['redis_queues_tls_client_key_file'] = nil
819831
# gitlab_rails['redis_shared_state_instance'] = nil
820832
# gitlab_rails['redis_shared_state_sentinels'] = nil
821833
# gitlab_rails['redis_shared_state_sentinels_password'] = nil
822834
# gitlab_rails['redis_shared_state_username'] = nil
823835
# gitlab_rails['redis_shared_state_password'] = nil
824836
# gitlab_rails['redis_shared_state_cluster_nodes'] = nil
837+
# gitlab_rails['redis_shared_state_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
838+
# gitlab_rails['redis_shared_state_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
839+
# gitlab_rails['redis_shared_state_tls_client_cert_file'] = nil
840+
# gitlab_rails['redis_shared_state_tls_client_key_file'] = nil
825841
# gitlab_rails['redis_trace_chunks_instance'] = nil
826842
# gitlab_rails['redis_trace_chunks_sentinels'] = nil
827843
# gitlab_rails['redis_trace_chunks_sentinels_password'] = nil
828844
# gitlab_rails['redis_trace_chunks_username'] = nil
829845
# gitlab_rails['redis_trace_chunks_password'] = nil
830846
# gitlab_rails['redis_trace_chunks_cluster_nodes'] = nil
847+
# gitlab_rails['redis_trace_chunks_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
848+
# gitlab_rails['redis_trace_chunks_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
849+
# gitlab_rails['redis_trace_chunks_tls_client_cert_file'] = nil
850+
# gitlab_rails['redis_trace_chunks_tls_client_key_file'] = nil
831851
# gitlab_rails['redis_actioncable_instance'] = nil
832852
# gitlab_rails['redis_actioncable_sentinels'] = nil
833853
# gitlab_rails['redis_actioncable_sentinels_password'] = nil
834854
# gitlab_rails['redis_actioncable_username'] = nil
835855
# gitlab_rails['redis_actioncable_password'] = nil
836856
# gitlab_rails['redis_actioncable_cluster_nodes'] = nil
857+
# gitlab_rails['redis_actioncable_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
858+
# gitlab_rails['redis_actioncable_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
859+
# gitlab_rails['redis_actioncable_tls_client_cert_file'] = nil
860+
# gitlab_rails['redis_actioncable_tls_client_key_file'] = nil
837861
# gitlab_rails['redis_rate_limiting_instance'] = nil
838862
# gitlab_rails['redis_rate_limiting_sentinels'] = nil
839863
# gitlab_rails['redis_rate_limiting_sentinels_password'] = nil
840864
# gitlab_rails['redis_rate_limiting_username'] = nil
841865
# gitlab_rails['redis_rate_limiting_password'] = nil
842866
# gitlab_rails['redis_rate_limiting_cluster_nodes'] = nil
867+
# gitlab_rails['redis_rate_limiting_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
868+
# gitlab_rails['redis_rate_limiting_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
869+
# gitlab_rails['redis_rate_limiting_tls_client_cert_file'] = nil
870+
# gitlab_rails['redis_rate_limiting_tls_client_key_file'] = nil
843871
# gitlab_rails['redis_sessions_instance'] = nil
844872
# gitlab_rails['redis_sessions_sentinels'] = nil
845873
# gitlab_rails['redis_sessions_sentinels_password'] = nil
846874
# gitlab_rails['redis_sessions_username'] = nil
847875
# gitlab_rails['redis_sessions_password'] = nil
848876
# gitlab_rails['redis_sessions_cluster_nodes'] = nil
877+
# gitlab_rails['redis_sessions_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
878+
# gitlab_rails['redis_sessions_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
879+
# gitlab_rails['redis_sessions_tls_client_cert_file'] = nil
880+
# gitlab_rails['redis_sessions_tls_client_key_file'] = nil
849881
# gitlab_rails['redis_cluster_rate_limiting_instance'] = nil
850882
# gitlab_rails['redis_cluster_rate_limiting_sentinels'] = nil
851883
# gitlab_rails['redis_cluster_rate_limiting_sentinels_password'] = nil
852884
# gitlab_rails['redis_cluster_rate_limiting_username'] = nil
853885
# gitlab_rails['redis_cluster_rate_limiting_password'] = nil
854886
# gitlab_rails['redis_cluster_rate_limiting_cluster_nodes'] = nil
887+
# gitlab_rails['redis_cluster_rate_limiting_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
888+
# gitlab_rails['redis_cluster_rate_limiting_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
889+
# gitlab_rails['redis_cluster_rate_limiting_tls_client_cert_file'] = nil
890+
# gitlab_rails['redis_cluster_rate_limiting_tls_client_key_file'] = nil
855891
# gitlab_rails['redis_repository_cache_instance'] = nil
856892
# gitlab_rails['redis_repository_cache_sentinels'] = nil
857893
# gitlab_rails['redis_repository_cache_sentinels_password'] = nil
858894
# gitlab_rails['redis_repository_cache_username'] = nil
859895
# gitlab_rails['redis_repository_cache_password'] = nil
860896
# gitlab_rails['redis_repository_cache_cluster_nodes'] = nil
897+
# gitlab_rails['redis_repository_cache_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
898+
# gitlab_rails['redis_repository_cache_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
899+
# gitlab_rails['redis_repository_cache_tls_client_cert_file'] = nil
900+
# gitlab_rails['redis_repository_cache_tls_client_key_file'] = nil
861901
# gitlab_rails['redis_workhorse_instance'] = nil
862902
# gitlab_rails['redis_workhorse_sentinels'] = nil
863903
# gitlab_rails['redis_workhorse_sentinels_password'] = nil
864904
# gitlab_rails['redis_workhorse_username'] = nil
865905
# gitlab_rails['redis_workhorse_password'] = nil
866906
# gitlab_rails['redis_workhorse_cluster_nodes'] = nil
907+
# gitlab_rails['redis_workhorse_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/'
908+
# gitlab_rails['redis_workhorse_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
909+
# gitlab_rails['redis_workhorse_tls_client_cert_file'] = nil
910+
# gitlab_rails['redis_workhorse_tls_client_key_file'] = nil
867911

868912
# gitlab_rails['redis_workhorse_sentinel_master'] = nil
869913

‎files/gitlab-cookbooks/gitlab/attributes/default.rb

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,10 @@
440440
default['gitlab']['gitlab_rails']['redis_host'] = "127.0.0.1"
441441
default['gitlab']['gitlab_rails']['redis_port'] = nil
442442
default['gitlab']['gitlab_rails']['redis_ssl'] = false
443+
default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'] = "#{node['package']['install-dir']}/embedded/ssl/certs/"
444+
default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'] = "#{node['package']['install-dir']}/embedded/ssl/certs/cacert.pem"
445+
default['gitlab']['gitlab_rails']['redis_tls_client_cert_file'] = nil
446+
default['gitlab']['gitlab_rails']['redis_tls_client_key_file'] = nil
443447
default['gitlab']['gitlab_rails']['redis_password'] = nil
444448
default['gitlab']['gitlab_rails']['redis_socket'] = "/var/opt/gitlab/redis/redis.socket"
445449
default['gitlab']['gitlab_rails']['redis_enable_client'] = true
@@ -451,60 +455,110 @@
451455
default['gitlab']['gitlab_rails']['redis_cache_username'] = nil
452456
default['gitlab']['gitlab_rails']['redis_cache_password'] = nil
453457
default['gitlab']['gitlab_rails']['redis_cache_cluster_nodes'] = []
458+
default['gitlab']['gitlab_rails']['redis_cache_ssl'] = false
459+
default['gitlab']['gitlab_rails']['redis_cache_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
460+
default['gitlab']['gitlab_rails']['redis_cache_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
461+
default['gitlab']['gitlab_rails']['redis_cache_tls_client_cert_file'] = nil
462+
default['gitlab']['gitlab_rails']['redis_cache_tls_client_key_file'] = nil
454463
default['gitlab']['gitlab_rails']['redis_queues_instance'] = nil
455464
default['gitlab']['gitlab_rails']['redis_queues_username'] = nil
456465
default['gitlab']['gitlab_rails']['redis_queues_password'] = nil
457466
default['gitlab']['gitlab_rails']['redis_queues_sentinels'] = []
458467
default['gitlab']['gitlab_rails']['redis_queues_sentinels_password'] = nil
459468
default['gitlab']['gitlab_rails']['redis_queues_cluster_nodes'] = []
469+
default['gitlab']['gitlab_rails']['redis_queues_ssl'] = false
470+
default['gitlab']['gitlab_rails']['redis_queues_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
471+
default['gitlab']['gitlab_rails']['redis_queues_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
472+
default['gitlab']['gitlab_rails']['redis_queues_tls_client_cert_file'] = nil
473+
default['gitlab']['gitlab_rails']['redis_queues_tls_client_key_file'] = nil
460474
default['gitlab']['gitlab_rails']['redis_shared_state_instance'] = nil
461475
default['gitlab']['gitlab_rails']['redis_shared_state_sentinels'] = []
462476
default['gitlab']['gitlab_rails']['redis_shared_state_sentinels_password'] = nil
463477
default['gitlab']['gitlab_rails']['redis_shared_state_username'] = nil
464478
default['gitlab']['gitlab_rails']['redis_shared_state_password'] = nil
465479
default['gitlab']['gitlab_rails']['redis_shared_state_cluster_nodes'] = []
480+
default['gitlab']['gitlab_rails']['redis_shared_state_ssl'] = false
481+
default['gitlab']['gitlab_rails']['redis_shared_state_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
482+
default['gitlab']['gitlab_rails']['redis_shared_state_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
483+
default['gitlab']['gitlab_rails']['redis_shared_state_tls_client_cert_file'] = nil
484+
default['gitlab']['gitlab_rails']['redis_shared_state_tls_client_key_file'] = nil
466485
default['gitlab']['gitlab_rails']['redis_trace_chunks_instance'] = nil
467486
default['gitlab']['gitlab_rails']['redis_trace_chunks_sentinels'] = []
468487
default['gitlab']['gitlab_rails']['redis_trace_chunks_sentinels_password'] = nil
469488
default['gitlab']['gitlab_rails']['redis_trace_chunks_username'] = nil
470489
default['gitlab']['gitlab_rails']['redis_trace_chunks_password'] = nil
471490
default['gitlab']['gitlab_rails']['redis_trace_chunks_cluster_nodes'] = []
491+
default['gitlab']['gitlab_rails']['redis_trace_chunks_ssl'] = false
492+
default['gitlab']['gitlab_rails']['redis_trace_chunks_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
493+
default['gitlab']['gitlab_rails']['redis_trace_chunks_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
494+
default['gitlab']['gitlab_rails']['redis_trace_chunks_tls_client_cert_file'] = nil
495+
default['gitlab']['gitlab_rails']['redis_trace_chunks_tls_client_key_file'] = nil
472496
default['gitlab']['gitlab_rails']['redis_actioncable_instance'] = nil
473497
default['gitlab']['gitlab_rails']['redis_actioncable_sentinels'] = []
474498
default['gitlab']['gitlab_rails']['redis_actioncable_sentinels_password'] = nil
475499
default['gitlab']['gitlab_rails']['redis_actioncable_username'] = nil
476500
default['gitlab']['gitlab_rails']['redis_actioncable_password'] = nil
477501
default['gitlab']['gitlab_rails']['redis_actioncable_cluster_nodes'] = []
502+
default['gitlab']['gitlab_rails']['redis_actioncable_ssl'] = false
503+
default['gitlab']['gitlab_rails']['redis_actioncable_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
504+
default['gitlab']['gitlab_rails']['redis_actioncable_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
505+
default['gitlab']['gitlab_rails']['redis_actioncable_tls_client_cert_file'] = nil
506+
default['gitlab']['gitlab_rails']['redis_actioncable_tls_client_key_file'] = nil
478507
default['gitlab']['gitlab_rails']['redis_rate_limiting_instance'] = nil
479508
default['gitlab']['gitlab_rails']['redis_rate_limiting_sentinels'] = []
480509
default['gitlab']['gitlab_rails']['redis_rate_limiting_sentinels_password'] = nil
481510
default['gitlab']['gitlab_rails']['redis_rate_limiting_username'] = nil
482511
default['gitlab']['gitlab_rails']['redis_rate_limiting_password'] = nil
483512
default['gitlab']['gitlab_rails']['redis_rate_limiting_cluster_nodes'] = []
513+
default['gitlab']['gitlab_rails']['redis_rate_limiting_ssl'] = false
514+
default['gitlab']['gitlab_rails']['redis_rate_limiting_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
515+
default['gitlab']['gitlab_rails']['redis_rate_limiting_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
516+
default['gitlab']['gitlab_rails']['redis_rate_limiting_tls_client_cert_file'] = nil
517+
default['gitlab']['gitlab_rails']['redis_rate_limiting_tls_client_key_file'] = nil
484518
default['gitlab']['gitlab_rails']['redis_sessions_instance'] = nil
485519
default['gitlab']['gitlab_rails']['redis_sessions_sentinels'] = []
486520
default['gitlab']['gitlab_rails']['redis_sessions_sentinels_password'] = nil
487521
default['gitlab']['gitlab_rails']['redis_sessions_username'] = nil
488522
default['gitlab']['gitlab_rails']['redis_sessions_password'] = nil
489523
default['gitlab']['gitlab_rails']['redis_sessions_cluster_nodes'] = []
524+
default['gitlab']['gitlab_rails']['redis_sessions_ssl'] = false
525+
default['gitlab']['gitlab_rails']['redis_sessions_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
526+
default['gitlab']['gitlab_rails']['redis_sessions_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
527+
default['gitlab']['gitlab_rails']['redis_sessions_tls_client_cert_file'] = nil
528+
default['gitlab']['gitlab_rails']['redis_sessions_tls_client_key_file'] = nil
490529
default['gitlab']['gitlab_rails']['redis_repository_cache_instance'] = nil
491530
default['gitlab']['gitlab_rails']['redis_repository_cache_sentinels'] = []
492531
default['gitlab']['gitlab_rails']['redis_repository_cache_sentinels_password'] = nil
493532
default['gitlab']['gitlab_rails']['redis_repository_cache_username'] = nil
494533
default['gitlab']['gitlab_rails']['redis_repository_cache_password'] = nil
495534
default['gitlab']['gitlab_rails']['redis_repository_cache_cluster_nodes'] = []
535+
default['gitlab']['gitlab_rails']['redis_repository_cache_ssl'] = false
536+
default['gitlab']['gitlab_rails']['redis_repository_cache_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
537+
default['gitlab']['gitlab_rails']['redis_repository_cache_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
538+
default['gitlab']['gitlab_rails']['redis_repository_cache_tls_client_cert_file'] = nil
539+
default['gitlab']['gitlab_rails']['redis_repository_cache_tls_client_key_file'] = nil
496540
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_instance'] = nil
497541
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_sentinels'] = []
498542
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_sentinels_password'] = nil
499543
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_username'] = nil
500544
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_password'] = nil
501545
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_cluster_nodes'] = []
546+
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_ssl'] = false
547+
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
548+
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
549+
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_tls_client_cert_file'] = nil
550+
default['gitlab']['gitlab_rails']['redis_cluster_rate_limiting_tls_client_key_file'] = nil
502551
default['gitlab']['gitlab_rails']['redis_workhorse_instance'] = nil
503552
default['gitlab']['gitlab_rails']['redis_workhorse_sentinels'] = []
504553
default['gitlab']['gitlab_rails']['redis_workhorse_sentinels_password'] = nil
505554
default['gitlab']['gitlab_rails']['redis_workhorse_username'] = nil
506555
default['gitlab']['gitlab_rails']['redis_workhorse_password'] = nil
507556
default['gitlab']['gitlab_rails']['redis_workhorse_cluster_nodes'] = []
557+
default['gitlab']['gitlab_rails']['redis_workhorse_ssl'] = false
558+
default['gitlab']['gitlab_rails']['redis_workhorse_tls_ca_cert_dir'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_dir'].dup
559+
default['gitlab']['gitlab_rails']['redis_workhorse_tls_ca_cert_file'] = default['gitlab']['gitlab_rails']['redis_tls_ca_cert_file'].dup
560+
default['gitlab']['gitlab_rails']['redis_workhorse_tls_client_cert_file'] = nil
561+
default['gitlab']['gitlab_rails']['redis_workhorse_tls_client_key_file'] = nil
508562

509563
# used by workhorse to connect to a separate external redis instead of the omnibus-gitlab redis
510564
default['gitlab']['gitlab_rails']['redis_workhorse_sentinel_master'] = nil

0 commit comments

Comments
 (0)