diff --git a/src/Core/Settings/GlobalSettings.cs b/src/Core/Settings/GlobalSettings.cs index 37314a4220..5627e98657 100644 --- a/src/Core/Settings/GlobalSettings.cs +++ b/src/Core/Settings/GlobalSettings.cs @@ -5,9 +5,6 @@ namespace Bit.Core.Settings; public class GlobalSettings : IGlobalSettings { - private const string BaseDirectoryLog = "/var/log/bitwarden"; - private const string BaseDirectoryConfig = "/config"; - private string _logDirectory; private string _licenseDirectory; @@ -19,8 +16,6 @@ public class GlobalSettings : IGlobalSettings DataProtection = new DataProtectionSettings(this); } - public bool UseNewDirectoryStructure { get; set; } - public bool SelfHosted { get; set; } public bool UnifiedDeployment { get; set; } public virtual string KnownProxies { get; set; } @@ -28,20 +23,7 @@ public class GlobalSettings : IGlobalSettings public virtual string ProjectName { get; set; } public virtual string LogDirectory { - get - { - if (!string.IsNullOrWhiteSpace(_logDirectory)) - { - return _logDirectory; - } - - if (UseNewDirectoryStructure) - { - return BaseDirectoryLog; - } - - return BuildDirectory(_logDirectory, "/logs"); - } + get => BuildDirectory(_logDirectory, "/logs"); set => _logDirectory = value; } public virtual bool LogDirectoryByProject { get; set; } = true; @@ -49,7 +31,7 @@ public class GlobalSettings : IGlobalSettings public virtual bool EnableDevLogging { get; set; } = false; public virtual string LicenseDirectory { - get => BuildDirectory(_licenseDirectory, UseNewDirectoryStructure ? "/shared/licenses" : "/core/licenses"); + get => BuildDirectory(_licenseDirectory, "/core/licenses"); set => _licenseDirectory = value; } public string LicenseCertificatePassword { get; set; } @@ -141,8 +123,7 @@ public class GlobalSettings : IGlobalSettings { return null; } - - return string.Concat(UseNewDirectoryStructure ? BaseDirectoryConfig : "/etc/bitwarden", appendedPath); + return string.Concat("/etc/bitwarden", appendedPath); } public class BaseServiceUriSettings : IBaseServiceUriSettings @@ -442,7 +423,7 @@ public class GlobalSettings : IGlobalSettings public string CertificatePassword { get; set; } public string Directory { - get => _globalSettings.BuildDirectory(_directory, _globalSettings.UseNewDirectoryStructure ? "/shared/aspnet-dataprotection" : "/core/aspnet-dataprotection"); + get => _globalSettings.BuildDirectory(_directory, "/core/aspnet-dataprotection"); set => _directory = value; } }