mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2026-11-09 23:59:17 -05:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17b159beff |
1 changed files with 4 additions and 0 deletions
|
|
@ -261,6 +261,10 @@ macro_rules! make_config {
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn from_file() -> Result<Option<Self>, Error> {
|
async fn from_file() -> Result<Option<Self>, Error> {
|
||||||
|
// The Fs operator would create the folder if it doesn't exist, which we never want
|
||||||
|
if !CONFIG_FILE_PARENT_DIR.starts_with("s3://") && !std::path::Path::new(&*CONFIG_FILE_PARENT_DIR).is_dir() {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
let operator = storage::operator_for_path(&CONFIG_FILE_PARENT_DIR)?;
|
let operator = storage::operator_for_path(&CONFIG_FILE_PARENT_DIR)?;
|
||||||
let config_bytes = match operator.read(&CONFIG_FILENAME).await {
|
let config_bytes = match operator.read(&CONFIG_FILENAME).await {
|
||||||
Ok(bytes) => bytes,
|
Ok(bytes) => bytes,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue