ci / rust (push) Failing after 7m18s
New helpers in maestro-installer::systemd: * `render_web_unit` — same shape as the daemon unit, ordered after `maestrod.service` so the proxy doesn't 502 on startup. * `user_web_unit_path` / `default_maestro_web_path` — under `~/.config/` and `~/.cargo/bin/` respectively. New wizard step (NAP-241 deferred this; phone-dogfood on 2026-05-26 surfaced it): after the daemon+systemd flow, optionally `cargo install maestro-web` and lay down `~/.config/systemd/user/maestro-web.service`. Re-runs detect the existing unit and refresh + restart silently. New flags: * `--no-web` — skip the prompt entirely (headless hosts). * `--web-exec-start <path>` — override the unit's ExecStart. Non-interactive (`--yes` / piped) skips the web step unless an existing unit is being refreshed — operators opt in by re-running once interactively, then subsequent unattended re-runs refresh automatically. docs/INSTALL.md updated with the new flow + flags. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
173 lines
5.8 KiB
Rust
173 lines
5.8 KiB
Rust
//! systemd detection + user-unit rendering.
|
|
//!
|
|
//! The wizard only ever writes a *user* unit (`~/.config/systemd/user/`), since
|
|
//! `maestrod` runs per-user and uses tmux sockets in the user's runtime dir.
|
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
/// Standard probe path. Present on hosts booted under systemd.
|
|
pub const SYSTEMD_PROBE_PATH: &str = "/run/systemd/system";
|
|
|
|
/// Filename written under `~/.config/systemd/user/` for the daemon.
|
|
pub const UNIT_FILE_NAME: &str = "maestrod.service";
|
|
|
|
/// Filename for the optional `maestro-web` browser UI unit (NAP-249).
|
|
pub const WEB_UNIT_FILE_NAME: &str = "maestro-web.service";
|
|
|
|
/// `true` when the given path exists. Production callers should pass
|
|
/// [`SYSTEMD_PROBE_PATH`]; tests inject a temp path so they're hermetic.
|
|
pub fn is_systemd_host(probe: &Path) -> bool {
|
|
probe.exists()
|
|
}
|
|
|
|
/// `~/.config/systemd/user/<unit>`. `None` if `$HOME` / config dir is
|
|
/// unresolvable.
|
|
pub fn user_unit_path_for(unit_name: &str) -> Option<PathBuf> {
|
|
let base = dirs::config_dir()?;
|
|
Some(base.join("systemd").join("user").join(unit_name))
|
|
}
|
|
|
|
/// Convenience: path for `maestrod.service`. Kept as a free function so
|
|
/// existing callers don't need to thread the unit name around.
|
|
pub fn user_unit_path() -> Option<PathBuf> {
|
|
user_unit_path_for(UNIT_FILE_NAME)
|
|
}
|
|
|
|
/// Convenience: path for `maestro-web.service` (NAP-249).
|
|
pub fn user_web_unit_path() -> Option<PathBuf> {
|
|
user_unit_path_for(WEB_UNIT_FILE_NAME)
|
|
}
|
|
|
|
/// Render the daemon unit. `exec_start` is the absolute path to `maestrod` —
|
|
/// we default to `~/.cargo/bin/maestrod` because that's where `cargo install`
|
|
/// lands binaries; systemd doesn't inherit the user's PATH, so we can't rely
|
|
/// on a bare `maestrod`.
|
|
pub fn render_user_unit(exec_start: &Path) -> String {
|
|
format!(
|
|
"[Unit]\n\
|
|
Description=Maestro per-host daemon (maestrod)\n\
|
|
Documentation=https://git.naps.pt/naps62/maestro\n\
|
|
After=network-online.target\n\
|
|
\n\
|
|
[Service]\n\
|
|
Type=simple\n\
|
|
ExecStart={exec}\n\
|
|
Restart=on-failure\n\
|
|
RestartSec=5\n\
|
|
\n\
|
|
[Install]\n\
|
|
WantedBy=default.target\n",
|
|
exec = exec_start.display()
|
|
)
|
|
}
|
|
|
|
/// Render the `maestro-web` user unit (NAP-249). Orders after `maestrod`
|
|
/// so the proxy doesn't return 502s on startup; `Wants=` keeps it best-effort
|
|
/// — operators with daemon-less hosts can still install web alone if they
|
|
/// later remove the dependency.
|
|
pub fn render_web_unit(exec_start: &Path) -> String {
|
|
format!(
|
|
"[Unit]\n\
|
|
Description=Maestro web UI (maestro-web)\n\
|
|
Documentation=https://git.naps.pt/naps62/maestro\n\
|
|
After=network-online.target maestrod.service\n\
|
|
Wants=maestrod.service\n\
|
|
\n\
|
|
[Service]\n\
|
|
Type=simple\n\
|
|
ExecStart={exec}\n\
|
|
Restart=on-failure\n\
|
|
RestartSec=5\n\
|
|
\n\
|
|
[Install]\n\
|
|
WantedBy=default.target\n",
|
|
exec = exec_start.display()
|
|
)
|
|
}
|
|
|
|
/// Default `ExecStart` target: `~/.cargo/bin/maestrod`. `None` if `$HOME` is
|
|
/// unresolvable.
|
|
pub fn default_maestrod_path() -> Option<PathBuf> {
|
|
Some(
|
|
dirs::home_dir()?
|
|
.join(".cargo")
|
|
.join("bin")
|
|
.join("maestrod"),
|
|
)
|
|
}
|
|
|
|
/// Default `ExecStart` target for the web unit: `~/.cargo/bin/maestro-web`.
|
|
pub fn default_maestro_web_path() -> Option<PathBuf> {
|
|
Some(
|
|
dirs::home_dir()?
|
|
.join(".cargo")
|
|
.join("bin")
|
|
.join("maestro-web"),
|
|
)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn is_systemd_host_true_when_probe_exists() {
|
|
let dir = tempfile::tempdir().unwrap();
|
|
let probe = dir.path().join("system");
|
|
std::fs::create_dir(&probe).unwrap();
|
|
assert!(is_systemd_host(&probe));
|
|
}
|
|
|
|
#[test]
|
|
fn is_systemd_host_false_when_probe_missing() {
|
|
let dir = tempfile::tempdir().unwrap();
|
|
let probe = dir.path().join("not-here");
|
|
assert!(!is_systemd_host(&probe));
|
|
}
|
|
|
|
#[test]
|
|
fn unit_renders_with_absolute_exec_start() {
|
|
let body = render_user_unit(Path::new("/home/alice/.cargo/bin/maestrod"));
|
|
assert!(body.contains("ExecStart=/home/alice/.cargo/bin/maestrod"));
|
|
assert!(body.contains("[Unit]"));
|
|
assert!(body.contains("[Service]"));
|
|
assert!(body.contains("[Install]"));
|
|
assert!(body.contains("WantedBy=default.target"));
|
|
assert!(body.contains("Restart=on-failure"));
|
|
}
|
|
|
|
#[test]
|
|
fn unit_ends_with_newline() {
|
|
let body = render_user_unit(Path::new("/x"));
|
|
assert!(body.ends_with('\n'), "unit must end with newline");
|
|
}
|
|
|
|
#[test]
|
|
fn user_unit_path_points_under_config_dir() {
|
|
let p = user_unit_path().expect("config dir resolvable in test env");
|
|
assert!(p.ends_with("systemd/user/maestrod.service"), "got {p:?}");
|
|
}
|
|
|
|
#[test]
|
|
fn user_web_unit_path_points_under_config_dir() {
|
|
let p = user_web_unit_path().expect("config dir resolvable in test env");
|
|
assert!(p.ends_with("systemd/user/maestro-web.service"), "got {p:?}");
|
|
}
|
|
|
|
#[test]
|
|
fn web_unit_renders_with_dependency_on_daemon() {
|
|
let body = render_web_unit(Path::new("/home/alice/.cargo/bin/maestro-web"));
|
|
assert!(body.contains("ExecStart=/home/alice/.cargo/bin/maestro-web"));
|
|
assert!(body.contains("After=network-online.target maestrod.service"));
|
|
assert!(body.contains("Wants=maestrod.service"));
|
|
assert!(body.contains("WantedBy=default.target"));
|
|
assert!(body.ends_with('\n'));
|
|
}
|
|
|
|
#[test]
|
|
fn default_maestro_web_path_under_cargo_bin() {
|
|
let p = default_maestro_web_path().expect("HOME resolvable in test env");
|
|
assert!(p.ends_with(".cargo/bin/maestro-web"), "got {p:?}");
|
|
}
|
|
}
|