Skip to content

Commit

Permalink
Merge remote-tracking branch 'couchbase/cheshire-cat'
Browse files Browse the repository at this point in the history
* MB-51752 [BP] Gather projector profiles when TLS is enforced

Change-Id: I6360d0dee655a93220dbc8162ccec34f0ff32cef
  • Loading branch information
stevewatanabe committed Apr 10, 2022
2 parents c640354 + 8ed0f78 commit 4b7a191
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
5 changes: 4 additions & 1 deletion cbcollect_info
Expand Up @@ -1251,7 +1251,10 @@ def correct_split(string, splitchar):


def make_product_task(guts, initargs_path, memcached_pass, options):
tls = read_guts(guts, "tls")
if read_guts(guts, "tls") == "true":
tls = True
else:
tls = False
root = os.path.abspath(os.path.join(initargs_path, "..", "..", "..", ".."))
dbdir = os.path.realpath(read_guts(guts, "db_dir"))
viewdir = os.path.realpath(read_guts(guts, "idx_dir"))
Expand Down
9 changes: 9 additions & 0 deletions scripts/dump-guts
Expand Up @@ -553,6 +553,15 @@ main_with_everything(StaticTerms, NSConfig, Node) ->
lists:member(S, Services)],
Tls = search_config_for_node(NSConfig, Node, node_encryption, false),

Tls = case search_config(NSConfig, cluster_encryption_level, none) of
strict ->
true;
all ->
true;
_ ->
false
end,

Pairs = Ports ++
[{ns_config, iolist_to_binary(io_lib:format("~p", [sanitize_config(NSConfig)]))},
{static_config, iolist_to_binary(io_lib:format("~p", [StaticTerms]))},
Expand Down

0 comments on commit 4b7a191

Please sign in to comment.