diff --git a/bitwarden_license/src/Scim/entrypoint.sh b/bitwarden_license/src/Scim/entrypoint.sh index 0d54517bb..4d593ef1a 100644 --- a/bitwarden_license/src/Scim/entrypoint.sh +++ b/bitwarden_license/src/Scim/entrypoint.sh @@ -35,7 +35,9 @@ mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/Scim.dll diff --git a/bitwarden_license/src/Sso/entrypoint.sh b/bitwarden_license/src/Sso/entrypoint.sh index 675362e6f..3f6a5eee2 100644 --- a/bitwarden_license/src/Sso/entrypoint.sh +++ b/bitwarden_license/src/Sso/entrypoint.sh @@ -35,10 +35,15 @@ mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx +fi + chown -R $USERNAME:$GROUPNAME /app -cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/Sso.dll diff --git a/src/Admin/entrypoint.sh b/src/Admin/entrypoint.sh index 814ae43e9..975460bad 100644 --- a/src/Admin/entrypoint.sh +++ b/src/Admin/entrypoint.sh @@ -35,7 +35,9 @@ mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/Admin.dll diff --git a/src/Api/entrypoint.sh b/src/Api/entrypoint.sh index 19c30c616..76c46596f 100644 --- a/src/Api/entrypoint.sh +++ b/src/Api/entrypoint.sh @@ -35,7 +35,9 @@ mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/Api.dll diff --git a/src/Billing/entrypoint.sh b/src/Billing/entrypoint.sh index 5fb0c5c67..6d98cfa6f 100644 --- a/src/Billing/entrypoint.sh +++ b/src/Billing/entrypoint.sh @@ -35,7 +35,9 @@ mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/Billing.dll diff --git a/src/Events/entrypoint.sh b/src/Events/entrypoint.sh index 1f382295a..57cd16c5b 100644 --- a/src/Events/entrypoint.sh +++ b/src/Events/entrypoint.sh @@ -35,7 +35,9 @@ mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/Events.dll diff --git a/src/EventsProcessor/entrypoint.sh b/src/EventsProcessor/entrypoint.sh index 814fcd19f..0ae7b82cb 100644 --- a/src/EventsProcessor/entrypoint.sh +++ b/src/EventsProcessor/entrypoint.sh @@ -34,7 +34,9 @@ mkdir -p /etc/bitwarden/logs #mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -#cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ -# && update-ca-certificates +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ + && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/EventsProcessor.dll diff --git a/src/Icons/entrypoint.sh b/src/Icons/entrypoint.sh index 5d7ac5623..9ed16fba2 100644 --- a/src/Icons/entrypoint.sh +++ b/src/Icons/entrypoint.sh @@ -34,7 +34,9 @@ mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/Icons.dll diff --git a/src/Identity/entrypoint.sh b/src/Identity/entrypoint.sh index 491a23cd1..eb96642d3 100644 --- a/src/Identity/entrypoint.sh +++ b/src/Identity/entrypoint.sh @@ -35,10 +35,15 @@ mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx +fi + chown -R $USERNAME:$GROUPNAME /app -cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/Identity.dll diff --git a/src/Notifications/entrypoint.sh b/src/Notifications/entrypoint.sh index 84874e244..e1555b6c5 100644 --- a/src/Notifications/entrypoint.sh +++ b/src/Notifications/entrypoint.sh @@ -34,7 +34,9 @@ mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/ca-certificates chown -R $USERNAME:$GROUPNAME /etc/bitwarden -cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ +if [[ $globalSettings__selfHosted == "true" ]]; then + cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ >/dev/null 2>&1 \ && update-ca-certificates +fi exec gosu $USERNAME:$GROUPNAME dotnet /app/Notifications.dll