Christoffer Martinsson
e61a845965
All checks were successful
Build and Release / build-and-release (push) Successful in 2m6s
- Remove all SystemRebuild command infrastructure from agent and dashboard
- Replace with direct tmux popup execution: ssh {user}@{host} {alias}
- Add configurable SSH user and rebuild alias in dashboard config
- Eliminate agent process crashes during rebuilds
- Simplify architecture by removing ZMQ command streaming complexity
- Clean up all related dead code and fix compilation warnings
Benefits:
- Process isolation: rebuild runs independently via SSH
- Crash resilience: agent/dashboard can restart without affecting rebuilds
- Configuration flexibility: SSH user and alias configurable per deployment
- Operational simplicity: standard tmux popup interface
68 lines
1.8 KiB
Rust
68 lines
1.8 KiB
Rust
use anyhow::Result;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::path::Path;
|
|
|
|
/// Main dashboard configuration
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct DashboardConfig {
|
|
pub zmq: ZmqConfig,
|
|
pub hosts: HostsConfig,
|
|
pub system: SystemConfig,
|
|
pub ssh: SshConfig,
|
|
}
|
|
|
|
/// ZMQ consumer configuration
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct ZmqConfig {
|
|
pub subscriber_ports: Vec<u16>,
|
|
}
|
|
|
|
/// Hosts configuration
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct HostsConfig {
|
|
pub predefined_hosts: Vec<String>,
|
|
}
|
|
|
|
/// System configuration
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct SystemConfig {
|
|
pub nixos_config_git_url: String,
|
|
pub nixos_config_branch: String,
|
|
pub nixos_config_working_dir: String,
|
|
pub nixos_config_api_key_file: Option<String>,
|
|
}
|
|
|
|
/// SSH configuration for rebuild operations
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct SshConfig {
|
|
pub rebuild_user: String,
|
|
pub rebuild_alias: String,
|
|
}
|
|
|
|
impl DashboardConfig {
|
|
pub fn load_from_file<P: AsRef<Path>>(path: P) -> Result<Self> {
|
|
let path = path.as_ref();
|
|
let content = std::fs::read_to_string(path)?;
|
|
let config: DashboardConfig = toml::from_str(&content)?;
|
|
Ok(config)
|
|
}
|
|
}
|
|
|
|
impl Default for DashboardConfig {
|
|
fn default() -> Self {
|
|
panic!("Dashboard configuration must be loaded from file - no hardcoded defaults allowed")
|
|
}
|
|
}
|
|
|
|
impl Default for ZmqConfig {
|
|
fn default() -> Self {
|
|
panic!("Dashboard configuration must be loaded from file - no hardcoded defaults allowed")
|
|
}
|
|
}
|
|
|
|
impl Default for HostsConfig {
|
|
fn default() -> Self {
|
|
panic!("Dashboard configuration must be loaded from file - no hardcoded defaults allowed")
|
|
}
|
|
}
|