Skip to content

Commit

Permalink
Remove warning when compiling only with mysql and add compatibility m…
Browse files Browse the repository at this point in the history
…ode with the old docker script names
  • Loading branch information
dani-garcia committed Apr 29, 2021
1 parent 6890c25 commit 1e5306b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
10 changes: 10 additions & 0 deletions docker/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

if [ -r /etc/vaultwarden.sh ]; then
. /etc/vaultwarden.sh
elif [ -r /etc/bitwarden_rs.sh ]; then
echo "### You are using the old /etc/bitwarden_rs.sh script, please migrate to /etc/vaultwarden.sh ###"
. /etc/bitwarden_rs.sh
fi

if [ -d /etc/vaultwarden.d ]; then
Expand All @@ -10,6 +13,13 @@ if [ -d /etc/vaultwarden.d ]; then
. $f
fi
done
elif [ -d /etc/bitwarden_rs.d ]; then
echo "### You are using the old /etc/bitwarden_rs.d script directory, please migrate to /etc/vaultwarden.d ###"
for f in /etc/bitwarden_rs.d/*.sh; do
if [ -r $f ]; then
. $f
fi
done
fi

exec /vaultwarden "${@}"
6 changes: 2 additions & 4 deletions src/db/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use chrono::prelude::*;
use diesel::r2d2::{ConnectionManager, Pool, PooledConnection};
use rocket::{
http::Status,
Expand Down Expand Up @@ -228,12 +227,11 @@ pub fn backup_database(conn: &DbConn) -> Result<(), Error> {
use std::path::Path;
let db_url = CONFIG.database_url();
let db_path = Path::new(&db_url).parent().unwrap().to_string_lossy();
let file_date = Utc::now().format("%Y%m%d_%H%M%S").to_string();
let file_date = chrono::Utc::now().format("%Y%m%d_%H%M%S").to_string();
diesel::sql_query(format!("VACUUM INTO '{}/db_{}.sqlite3'", db_path, file_date)).execute(conn)?;
Ok(())
}
}

Ok(())
}

/// Get the SQL Server version
Expand Down

0 comments on commit 1e5306b

Please sign in to comment.