1
0
mirror of https://github.com/bitwarden/server.git synced 2025-07-20 08:57:07 -05:00

fix: flip bool condition and make it nullable

This commit is contained in:
tangowithfoxtrot
2024-10-28 12:45:32 -07:00
parent 1d87ba3a46
commit 02393835f8
3 changed files with 8 additions and 6 deletions

View File

@ -97,8 +97,8 @@ public class Configuration
[Description("Enable SCIM")]
public bool EnableScim { get; set; } = false;
[Description("Disable Built-In MSSQL Container Generation")]
public bool DisableBuiltInMsSql { get; set; }
[Description("Enable Built-In MSSQL Container Generation")]
public bool? EnableBuiltInMsSql { get; set; } = true;
[YamlIgnore]
public string Domain

View File

@ -42,7 +42,7 @@ public class DockerComposeBuilder
{
public TemplateModel(Context context)
{
DisableBuiltInMsSql = context.Config.DisableBuiltInMsSql;
EnableBuiltInMsSql = context.Config.EnableBuiltInMsSql;
MssqlDataDockerVolume = context.Config.DatabaseDockerVolume;
EnableKeyConnector = context.Config.EnableKeyConnector;
EnableScim = context.Config.EnableScim;
@ -62,7 +62,7 @@ public class DockerComposeBuilder
}
}
public bool DisableBuiltInMsSql { get; set; }
public bool? EnableBuiltInMsSql { get; set; }
public bool MssqlDataDockerVolume { get; set; }
public bool EnableKeyConnector { get; set; }
public bool EnableScim { get; set; }

View File

@ -14,7 +14,7 @@
#########################################################################
services:
{{#if DisableBuiltInMsSql}}
{{#if EnableBuiltInMsSql}}
mssql:
image: bitwarden/mssql:{{{CoreVersion}}}
container_name: bitwarden-mssql
@ -32,8 +32,8 @@ services:
- mssql.env
- ../env/uid.env
- ../env/mssql.override.env
{{/if}}
{{/if}}
web:
image: bitwarden/web:{{{WebVersion}}}
container_name: bitwarden-web
@ -108,8 +108,10 @@ services:
image: bitwarden/admin:{{{CoreVersion}}}
container_name: bitwarden-admin
restart: always
{{#if EnableBuiltInMsSql}}
depends_on:
- mssql
{{/if}}
volumes:
- ../core:/etc/bitwarden/core
- ../ca-certificates:/etc/bitwarden/ca-certificates