From 444251c00e16be033e41df885327d11d67798b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20P=2E=20Bragan=C3=A7a?= <495495+thefringeninja@users.noreply.github.com> Date: Wed, 5 Apr 2023 10:55:27 -0700 Subject: [PATCH] set TrustedRootCertificatePath to sensible default on linux --- src/EventStore.Common/Utils/Locations.cs | 2 ++ src/EventStore.Core/ClusterVNodeOptions.cs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/EventStore.Common/Utils/Locations.cs b/src/EventStore.Common/Utils/Locations.cs index 97ff6364ca2..cd813637580 100644 --- a/src/EventStore.Common/Utils/Locations.cs +++ b/src/EventStore.Common/Utils/Locations.cs @@ -17,6 +17,7 @@ public class Locations { public static readonly string DefaultLogDirectory; public static readonly string DefaultTestClientLogDirectory; public static readonly string FallbackDefaultDataDirectory; + public static readonly string DefaultTrustedRootCertificateDirectory; static Locations() { ApplicationDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? @@ -31,6 +32,7 @@ public class Locations { DefaultConfigurationDirectory = "/etc/eventstore"; DefaultDataDirectory = "/var/lib/eventstore"; DefaultLogDirectory = "/var/log/eventstore"; + DefaultTrustedRootCertificateDirectory = "/etc/ssl/certs"; DefaultTestClientLogDirectory = Path.Combine(ApplicationDirectory, "testclientlog"); if (!Directory.Exists(PluginsDirectory)) PluginsDirectory = Path.Combine(DefaultContentDirectory, "plugins"); diff --git a/src/EventStore.Core/ClusterVNodeOptions.cs b/src/EventStore.Core/ClusterVNodeOptions.cs index 1504cac3124..ce2085fa56d 100644 --- a/src/EventStore.Core/ClusterVNodeOptions.cs +++ b/src/EventStore.Core/ClusterVNodeOptions.cs @@ -274,7 +274,8 @@ public record CertificateFileOptions { public record CertificateOptions { [Description("The path to a directory which contains trusted X.509 (.pem, .crt, .cer, .der) " + "root certificate files.")] - public string? TrustedRootCertificatesPath { get; init; } + public string? TrustedRootCertificatesPath { get; init; } = + Locations.DefaultTrustedRootCertificateDirectory; [Description("The reserved common name to authenticate EventStoreDB nodes/servers from certificates")] public string CertificateReservedNodeCommonName { get; init; } = "eventstoredb-node";