Skip to content

Commit 0816c2f

Browse files
committed
rabbit_peer_discovery: Wrap long line in add_tls_arguments/2
1 parent 99a1a84 commit 0816c2f

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

deps/rabbit/src/rabbit_peer_discovery.erl

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -444,39 +444,36 @@ add_tls_arguments(InetDistModule, VMArgs0) ->
444444
["-pa", filename:dirname(code:which(inet6_tls_dist))
445445
| ProtoDistArg]
446446
end,
447-
%% In the next case, RabbitMQ has been configured with additional Erlang VM arguments such as this:
447+
%% In the next case, RabbitMQ has been configured with additional Erlang VM
448+
%% arguments such as this:
448449
%%
449450
%% SERVER_ADDITIONAL_ERL_ARGS="-pa $ERL_SSL_PATH -proto_dist inet_tls
450451
%% -ssl_dist_opt server_cacertfile /etc/rabbitmq/ca_certificate.pem
451-
%% -ssl_dist_opt server_certfile /etc/rabbitmq/server_rmq0.local_certificate.pem
452-
%% -ssl_dist_opt server_keyfile /etc/rabbitmq/server_rmq0.local_key.pem
452+
%% -ssl_dist_opt server_certfile /etc/rabbitmq/server_certificate.pem
453+
%% -ssl_dist_opt server_keyfile /etc/rabbitmq/server_key.pem
453454
%% -ssl_dist_opt server_verify verify_peer
454455
%% -ssl_dist_opt server_fail_if_no_peer_cert true
455456
%% -ssl_dist_opt client_cacertfile /etc/rabbitmq/ca_certificate.pem
456-
%% -ssl_dist_opt client_certfile /etc/rabbitmq/client_rmq0.local_certificate.pem
457-
%% -ssl_dist_opt client_keyfile /etc/rabbitmq/client_rmq0.local_key.pem
457+
%% -ssl_dist_opt client_certfile /etc/rabbitmq/client_certificate.pem
458+
%% -ssl_dist_opt client_keyfile /etc/rabbitmq/client_key.pem
458459
%% -ssl_dist_opt client_verify verify_peer"
459460
%%
460461
%% `init:get_argument(ssl_dist_opt)' returns the following data structure:
461462
%%
462463
%% ([email protected])1> init:get_argument(ssl_dist_opt).
463-
%% {ok,[["server_cacertfile",
464-
%% "/etc/rabbitmq/ca_certificate.pem"],
465-
%% ["server_certfile",
466-
%% "/etc/rabbitmq/server_rmq0.local_certificate.pem"],
467-
%% ["server_keyfile","/etc/rabbitmq/server_rmq0.local_key.pem"],
464+
%% {ok,[["server_cacertfile", "/etc/rabbitmq/ca_certificate.pem"],
465+
%% ["server_certfile", "/etc/rabbitmq/server_certificate.pem"],
466+
%% ["server_keyfile","/etc/rabbitmq/server_key.pem"],
468467
%% ["server_verify","verify_peer"],
469468
%% ["server_fail_if_no_peer_cert","true"],
470469
%% ["client_cacertfile","/etc/rabbitmq/ca_certificate.pem"],
471-
%% ["client_certfile",
472-
%% "/etc/rabbitmq/client_rmq0.local_certificate.pem"],
473-
%% ["client_keyfile","/etc/rabbitmq/client_rmq0.local_key.pem"],
470+
%% ["client_certfile", "/etc/rabbitmq/client_certificate.pem"],
471+
%% ["client_keyfile","/etc/rabbitmq/client_key.pem"],
474472
%% ["client_verify","verify_peer"]]}
475473
%%
476474
%% Which is then translated into arguments to `peer:start/1':
477475
%% #{args =>
478-
%% ["-ssl_dist_opt",
479-
%% "server_cacertfile",
476+
%% ["-ssl_dist_opt","server_cacertfile",
480477
%% "/etc/rabbitmq/ca_certificate.pem",
481478
%% "-ssl_dist_opt","server_certfile",
482479
%% "/etc/rabbitmq/server_rmq2.local_certificate.pem",
@@ -506,11 +503,14 @@ add_tls_arguments(InetDistModule, VMArgs0) ->
506503
_ ->
507504
VMArgs1
508505
end,
509-
%% In the next case, RabbitMQ has been configured with additional Erlang VM arguments such as this:
506+
%% In the next case, RabbitMQ has been configured with additional Erlang VM
507+
%% arguments such as this:
510508
%%
511-
%% SERVER_ADDITIONAL_ERL_ARGS="-pa $ERL_SSL_PATH -proto_dist inet_tls -ssl_dist_optfile /etc/rabbitmq/inter_node_tls.config"
509+
%% SERVER_ADDITIONAL_ERL_ARGS="-pa $ERL_SSL_PATH -proto_dist inet_tls
510+
%% -ssl_dist_optfile /etc/rabbitmq/inter_node_tls.config"
512511
%%
513-
%% This code adds the `ssl_dist_optfile' argument to the peer node's argument list
512+
%% This code adds the `ssl_dist_optfile' argument to the peer node's
513+
%% argument list.
514514
VMArgs3 = case init:get_argument(ssl_dist_optfile) of
515515
{ok, [[SslDistOptfileArg]]} ->
516516
["-ssl_dist_optfile", SslDistOptfileArg | VMArgs2];

0 commit comments

Comments
 (0)