diff --git a/src/core/bootstrap/mod.rs b/src/core/bootstrap/mod.rs index b7685c80f..3283987e9 100644 --- a/src/core/bootstrap/mod.rs +++ b/src/core/bootstrap/mod.rs @@ -15,7 +15,6 @@ use rcgen::{ BasicConstraints, CertificateParams, DistinguishedName, DnType, IsCa, Issuer, KeyPair, }; use std::fs; -use std::path::Path; #[cfg(unix)] use std::os::unix::fs::PermissionsExt; use std::path::{Path, PathBuf}; diff --git a/src/core/package_manager/facade.rs b/src/core/package_manager/facade.rs index a16417c3d..f047a2197 100644 --- a/src/core/package_manager/facade.rs +++ b/src/core/package_manager/facade.rs @@ -1076,12 +1076,12 @@ Store credentials in Vault: let db_password = if let Ok(env_pwd) = std::env::var("BOOTSTRAP_DB_PASSWORD") { env_pwd } else if !db_password_override.is_empty() { - db_password_override.clone() + db_password_override.to_string() } else { match get_database_url_sync() { Ok(url) => { let (_, password, _, _, _) = parse_database_url(&url); - password + password.to_string() } Err(_) => { trace!("Vault not available for DB_PASSWORD, using empty string"); diff --git a/src/embedded_ui.rs b/src/embedded_ui.rs index 53428a4e6..463f7dfff 100644 --- a/src/embedded_ui.rs +++ b/src/embedded_ui.rs @@ -134,3 +134,18 @@ pub fn list_embedded_files() -> Vec { log::debug!("Embedded UI contains {} files", files.len()); files } + +#[cfg(not(feature = "embed-ui"))] +pub fn has_embedded_ui() -> bool { + false +} + +#[cfg(not(feature = "embed-ui"))] +pub fn list_embedded_files() -> Vec { + Vec::new() +} + +#[cfg(not(feature = "embed-ui"))] +pub fn embedded_ui_router() -> Router { + Router::new() +}