diff --git a/doc/guides/installation.md b/doc/guides/installation.md index 460efec..ac3e465 100644 --- a/doc/guides/installation.md +++ b/doc/guides/installation.md @@ -19,9 +19,7 @@ It is recommended you stick to either using a tagged version of wire, or the `st ## Binary Cache -You must enable the [garnix binary cache](https://garnix.io/docs/caching) on all -nodes in your wire hive, otherwise they will not accept the wire key agent and -you will be compiling everything from source. +You should enable the [garnix binary cache](https://garnix.io/docs/caching). ## Installation through flakes diff --git a/doc/guides/migrate.md b/doc/guides/migrate.md index 2b677fe..1136f0d 100644 --- a/doc/guides/migrate.md +++ b/doc/guides/migrate.md @@ -19,8 +19,6 @@ If you're familiar with colmena, wire will hopefully come quickly to you! (or, atleast that was the intention when writing it!). There are a few changes you should know: -- Wire pushes a real binary file to apply keys. You'll need to _atleast_ add garnix's - public key for your remote server otherwise it will refuse the binary. - [You don't have to use a root user](/guides/non-root-user.html) - `apply-local` does not exist, `apply` will apply locally when appropriate - [Many options have been aliased to nicer names](/reference/module.html) diff --git a/doc/snippets/guides/installation/flake.nix b/doc/snippets/guides/installation/flake.nix index b291cf4..358a91a 100644 --- a/doc/snippets/guides/installation/flake.nix +++ b/doc/snippets/guides/installation/flake.nix @@ -18,7 +18,7 @@ forAllSystems = nixpkgs.lib.genAttrs (import systems); in { wire = wire.makeHive { - nixpkgs = import nixpkgs {localSystem = "x86_64-linux";}; + meta.nixpkgs = import nixpkgs {localSystem = "x86_64-linux";}; # Continue to next How-To guide to fill this section }; diff --git a/wire/lib/src/hive/steps/cleanup.rs b/wire/lib/src/hive/steps/cleanup.rs index 90c34e3..9de8e9a 100644 --- a/wire/lib/src/hive/steps/cleanup.rs +++ b/wire/lib/src/hive/steps/cleanup.rs @@ -3,13 +3,10 @@ use std::fmt::Display; -use tokio::process::Command; -use tracing::debug; use crate::{ - SubCommandModifiers, errors::HiveLibError, - hive::node::{Context, ExecuteStep, Node}, + hive::node::{Context, ExecuteStep}, }; #[derive(PartialEq, Debug)] @@ -21,40 +18,12 @@ impl Display for CleanUp { } } -pub(crate) async fn clean_up_control_master( - node: &Node, - modifiers: SubCommandModifiers, -) -> Result<(), HiveLibError> { - let output = Command::new("ssh") - .args(node.target.create_ssh_args(modifiers, true, false)?) - .args(["-O", "stop", node.target.get_preferred_host()?]) - .output() - .await; - - match output { - Err(err) => { - debug!("failed to wind-down ControlMaster with `ssh -O stop`: {err}"); - } - Ok(std::process::Output { status, stderr, .. }) if !status.success() => { - debug!( - "failed to wind-down ControlMaster with `ssh -O stop`: {}", - String::from_utf8_lossy(&stderr) - ); - } - Ok(_) => {} - } - - Ok(()) -} - impl ExecuteStep for CleanUp { fn should_execute(&self, ctx: &Context) -> bool { !ctx.should_apply_locally } - async fn execute(&self, ctx: &mut Context<'_>) -> Result<(), HiveLibError> { - let _ = clean_up_control_master(ctx.node, ctx.modifiers).await; - + async fn execute(&self, _ctx: &mut Context<'_>) -> Result<(), HiveLibError> { Ok(()) } }