Browse Source
Remove warning when compiling only with mysql and add compatibility mode with the old docker script names
pull/1640/head
1.21.0
Daniel García
4 years ago
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
2 changed files with
12 additions and
4 deletions
-
docker/start.sh
-
src/db/mod.rs
|
|
@ -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 |
|
|
@ -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 "${@}" |
|
|
|
|
|
@ -1,4 +1,3 @@ |
|
|
|
use chrono::prelude::*; |
|
|
|
use diesel::r2d2::{ConnectionManager, Pool, PooledConnection}; |
|
|
|
use rocket::{ |
|
|
|
http::Status, |
|
|
@ -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
|
|
|
|