mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2025-09-10 18:55:57 +03:00
Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
4438da39f9 | ||
|
0b2383ab56 |
@@ -1,17 +1,15 @@
|
|||||||
#!/bin/sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
# Use the value of the corresponding env var (if present),
|
# Use the value of the corresponding env var (if present),
|
||||||
# or a default value otherwise.
|
# or a default value otherwise.
|
||||||
: "${DATA_FOLDER:="data"}"
|
: "${DATA_FOLDER:="/data"}"
|
||||||
: "${ROCKET_PORT:="80"}"
|
: "${ROCKET_PORT:="80"}"
|
||||||
|
: "${ENV_FILE:="/.env"}"
|
||||||
|
|
||||||
CONFIG_FILE="${DATA_FOLDER}"/config.json
|
CONFIG_FILE="${DATA_FOLDER}"/config.json
|
||||||
|
|
||||||
# Check if there is a .env file configured
|
# Check if the $ENV_FILE file exist and is readable
|
||||||
# If that is the case, load it into the environment before running any check
|
# If that is the case, load it into the environment before running any check
|
||||||
if [ -z "${ENV_FILE}" ]; then
|
|
||||||
ENV_FILE=".env"
|
|
||||||
fi
|
|
||||||
if [ -r "${ENV_FILE}" ]; then
|
if [ -r "${ENV_FILE}" ]; then
|
||||||
# shellcheck disable=SC1090
|
# shellcheck disable=SC1090
|
||||||
. "${ENV_FILE}"
|
. "${ENV_FILE}"
|
||||||
|
@@ -268,7 +268,9 @@ async fn _password_login(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// register push device
|
// register push device
|
||||||
register_push_device(&mut device, conn).await?;
|
if !new_device {
|
||||||
|
register_push_device(&mut device, conn).await?;
|
||||||
|
}
|
||||||
|
|
||||||
// Common
|
// Common
|
||||||
// ---
|
// ---
|
||||||
|
Reference in New Issue
Block a user