Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Secure Mode #2628

Merged
merged 1 commit into from
Aug 10, 2020
Merged

Secure Mode #2628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/EventStore.ClusterNode/ClusterVNodeHostedService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ internal class ClusterVNodeHostedService : EventStoreHostedService<ClusterNodeOp

if (opts.DisableInternalTcpTls) {
Log.Warning(
$"\n DEPRECATION WARNING: The '{nameof(Options.DisableInternalTcpTls)}' option has been deprecated as of version 20.6.1. "
$"\n DEPRECATION WARNING: The '{nameof(Options.DisableInternalTcpTls)}' option has been deprecated as of version 20.6.1 and currently has no effect. "
+ $"Please use the '{nameof(Options.Insecure)}' option instead.\n");
}

Expand Down Expand Up @@ -199,7 +199,7 @@ internal class ClusterVNodeHostedService : EventStoreHostedService<ClusterNodeOp
private static ClusterVNode BuildNode(ClusterNodeOptions options, Func<ClusterNodeOptions> loadConfigFunc) {
var quorumSize = GetQuorumSize(options.ClusterSize);

var disableInternalTcpTls = options.Insecure || options.DisableInternalTcpTls;
var disableInternalTcpTls = options.Insecure;
var disableExternalTcpTls = options.Insecure || options.DisableExternalTcpTls;

var httpEndPoint = new IPEndPoint(options.ExtIp, options.HttpPort);
Expand Down Expand Up @@ -342,8 +342,6 @@ internal class ClusterVNodeHostedService : EventStoreHostedService<ClusterNodeOp
builder.DisableExternalTcpTls();
builder.DisableHttps();
}
if (options.DisableInternalTcpTls)
builder.DisableInternalTcpTls();
if (options.DisableExternalTcpTls)
builder.DisableExternalTcpTls();
if (options.EnableExternalTCP)
Expand Down