nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-01 08:40:33 -05:00
Code

add optional newer directory structure config options for rootless images

Browse Source 
Co-authored-by: Justin Baur <justindbaur@users.noreply.github.com>
This commit is contained in:
tangowithfoxtrot 2025-02-25 10:01:28 -08:00
parent 04437f0455
commit f356d0a2b1
No known key found for this signature in database
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Core/Settings/GlobalSettings.cs
View File

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