GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

Fix bootstrap database creation - use BOOTSTRAP_DB_PASSWORD env var

Browse source
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-02-05 14:42:13 -03:00
parent 5d5be5546f
commit dfb18f75e6
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/bootstrap/mod.rs
View file

@ -921,10 +921,12 @@ impl BootstrapManager {
if component == "tables" {
info!("Starting PostgreSQL database...");
std::env::set_var("BOOTSTRAP_DB_PASSWORD", &db_password);
match pm.start("tables") {
Ok(_) => {
info!("PostgreSQL started successfully");
tokio::time::sleep(tokio::time::Duration::from_secs(3)).await;
}
Err(e) => {
@ -932,6 +934,8 @@ impl BootstrapManager {
}
}
std::env::remove_var("BOOTSTRAP_DB_PASSWORD");
info!("Running database migrations...");
let database_url =
format!("postgres://gbuser:{}@localhost:5432/botserver", db_password);

26
src/core/package_manager/facade.rs
View file

@ -1047,6 +1047,10 @@ Store credentials in Vault:
Ok(())
}
pub fn run_commands(&self, commands: &[String], target: &str, component: &str) -> Result<()> {
self.run_commands_with_password(commands, target, component, &String::new())
}
pub fn run_commands_with_password(&self, commands: &[String], target: &str, component: &str, db_password_override: &str) -> Result<()> {
let bin_path = if target == "local" {
self.base_path.join("bin").join(component)
} else {
@ -1069,14 +1073,20 @@ Store credentials in Vault:
PathBuf::from("/opt/gbo/logs")
};
let db_password = match get_database_url_sync() {
Ok(url) => {
let (_, password, _, _, _) = parse_database_url(&url);
password
}
Err(_) => {
trace!("Vault not available for DB_PASSWORD, using empty string");
String::new()
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()
} else {
match get_database_url_sync() {
Ok(url) => {
let (_, password, _, _, _) = parse_database_url(&url);
password
}
Err(_) => {
trace!("Vault not available for DB_PASSWORD, using empty string");
String::new()
}
}
};