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

Fix installer: write DATABASE_URL after DB creation and append drive credentials later; update drive credentials only after DB ready

Browse source
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2025-10-28 20:39:14 -03:00
parent 1a2a984c78
commit 77421683b7
1 changed files with 46 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/package_manager/installer.rs
View file

@ -63,8 +63,8 @@ impl PackageManager {
fn register_drive(&mut self) { fn register_drive(&mut self) {
let drive_password = self.generate_secure_password(16); let drive_password = self.generate_secure_password(16);
let drive_user = "gbdriveuser".to_string(); let drive_user = "gbdriveuser".to_string();
let farm_password = std::env::var("FARM_PASSWORD") let farm_password =
.unwrap_or_else(|_| self.generate_secure_password(32)); std::env::var("FARM_PASSWORD").unwrap_or_else(|_| self.generate_secure_password(32));
let encrypted_drive_password = self.encrypt_password(&drive_password, &farm_password); let encrypted_drive_password = self.encrypt_password(&drive_password, &farm_password);
let env_path = self.base_path.join(".env"); let env_path = self.base_path.join(".env");
@ -111,8 +111,37 @@ impl PackageManager {
}, },
); );
self.update_drive_credentials_in_database(&encrypted_drive_password) // Delay updating drive credentials until database is created
.ok(); let db_env_path = self.base_path.join(".env");
let database_url = std::env::var("DATABASE_URL")
.unwrap_or_else(|_| "postgres://gbuser:@localhost:5432/botserver".to_string());
let db_line = format!("DATABASE_URL={}\n", database_url);
let _ = std::fs::write(&db_env_path, db_line);
// Append drive credentials after database creation
let env_path = self.base_path.join(".env");
let drive_lines = format!(
"DRIVE_USER={}\nDRIVE_PASSWORD={}\nFARM_PASSWORD={}\nDRIVE_ROOT_USER={}\nDRIVE_ROOT_PASSWORD={}\n",
drive_user, drive_password, farm_password, drive_user, drive_password
);
let _ = std::fs::OpenOptions::new()
.append(true)
.open(&env_path)
.and_then(|mut file| std::io::Write::write_all(&mut file, drive_lines.as_bytes()));
// Update drive credentials in database only after database is ready
if std::process::Command::new("pg_isready")
.arg("-h")
.arg("localhost")
.arg("-p")
.arg("5432")
.output()
.map(|o| o.status.success())
.unwrap_or(false)
{
self.update_drive_credentials_in_database(&encrypted_drive_password)
.ok();
}
} }
fn update_drive_credentials_in_database(&self, encrypted_drive_password: &str) -> Result<()> { fn update_drive_credentials_in_database(&self, encrypted_drive_password: &str) -> Result<()> {
@ -750,7 +779,10 @@ post_install_cmds_linux: vec![
if let Ok(output) = check_output { if let Ok(output) = check_output {
if output.status.success() { if output.status.success() {
trace!("Component {} is already running, skipping start", component.name); trace!(
"Component {} is already running, skipping start",
component.name
);
return Ok(std::process::Command::new("sh") return Ok(std::process::Command::new("sh")
.arg("-c") .arg("-c")
.arg("echo 'Already running'") .arg("echo 'Already running'")
@ -766,7 +798,11 @@ post_install_cmds_linux: vec![
.replace("{{CONF_PATH}}", &conf_path.to_string_lossy()) .replace("{{CONF_PATH}}", &conf_path.to_string_lossy())
.replace("{{LOGS_PATH}}", &logs_path.to_string_lossy()); .replace("{{LOGS_PATH}}", &logs_path.to_string_lossy());
trace!("Starting component {} with command: {}", component.name, rendered_cmd); trace!(
"Starting component {} with command: {}",
component.name,
rendered_cmd
);
let child = std::process::Command::new("sh") let child = std::process::Command::new("sh")
.current_dir(&bin_path) .current_dir(&bin_path)
@ -779,7 +815,10 @@ post_install_cmds_linux: vec![
Err(e) => { Err(e) => {
let err_msg = e.to_string(); let err_msg = e.to_string();
if err_msg.contains("already running") || component.name == "tables" { if err_msg.contains("already running") || component.name == "tables" {
trace!("Component {} may already be running, continuing anyway", component.name); trace!(
"Component {} may already be running, continuing anyway",
component.name
);
Ok(std::process::Command::new("sh") Ok(std::process::Command::new("sh")
.arg("-c") .arg("-c")
.arg("echo 'Already running'") .arg("echo 'Already running'")