git.delta.rocks / jrsonnet / refs/commits / fcad02a8426f

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -962,6 +962,7 @@
  "nixlike",
  "nom",
  "openssh",
+ "rand",
  "serde",
  "serde_json",
  "tempfile",

--- a/cmds/fleet/src/cmds/build_systems.rs
+++ b/cmds/fleet/src/cmds/build_systems.rs
@@ -253,12 +253,12 @@
 
 async fn build_task(
 	config: Config,
-	host: String,
+	hostname: String,
 	build_attr: &str,
 	batch: Option<NixBuildBatch>,
 ) -> Result<PathBuf> {
 	info!("building");
-	let host = config.host(&host).await?;
+	let host = config.host(&hostname).await?;
 	// let action = Action::from(self.subcommand.clone());
 	let nixos = host.nixos_config().await?;
 	let drv = nix_go!(nixos.system.build[{ build_attr }]);
@@ -267,6 +267,21 @@
 		.get("out")
 		.ok_or_else(|| anyhow!("system build should produce \"out\" output"))?;
 
+	{
+		info!("adding gc root");
+		let mut cmd = config.local_host().cmd("nix").await?;
+		cmd.arg("build")
+			.comparg(
+				"--profile",
+				format!(
+					"/nix/var/nix/profiles/{}-{hostname}",
+					config.data().gc_root_prefix
+				),
+			)
+			.arg(out_output);
+		cmd.sudo().run_nix().await?;
+	}
+
 	Ok(out_output.clone())
 }
 

--- a/crates/fleet-base/Cargo.toml
+++ b/crates/fleet-base/Cargo.toml
@@ -17,6 +17,7 @@
 nixlike.workspace = true
 nom = "7.1.3"
 openssh = "0.11.0"
+rand = "0.8.5"
 serde.workspace = true
 serde_json = "1.0.127"
 tempfile.workspace = true

6use age::Recipient;6use age::Recipient;
7use chrono::{DateTime, Utc};7use chrono::{DateTime, Utc};
8use fleet_shared::SecretData;8use fleet_shared::SecretData;
9use rand::{
10	distributions::{Alphanumeric, DistString},
11	thread_rng,
12};
9use serde::{de::Error, Deserialize, Serialize};13use serde::{de::Error, Deserialize, Serialize};
10use serde_json::Value;14use serde_json::Value;
1115
42	}46	}
43}47}
48
49fn generate_gc_prefix() -> String {
50	let id = Alphanumeric.sample_string(&mut thread_rng(), 8);
51	format!("fleet-gc-{id}")
52}
4453
45#[derive(Serialize, Deserialize)]54#[derive(Serialize, Deserialize)]
46#[serde(rename_all = "camelCase")]55#[serde(rename_all = "camelCase")]
47pub struct FleetData {56pub struct FleetData {
48	pub version: FleetDataVersion,57	pub version: FleetDataVersion,
58	#[serde(default = "generate_gc_prefix")]
59	pub gc_root_prefix: String,
4960
50	#[serde(default)]61	#[serde(default)]
51	pub hosts: BTreeMap<String, HostData>,62	pub hosts: BTreeMap<String, HostData>,

--- a/modules/hosts.nix
+++ b/modules/hosts.nix
@@ -16,6 +16,10 @@
             type = str;
             internal = true;
           };
+          gcRootPrefix = mkOption {
+            type = str;
+            internal = true;
+          };
           hosts = mkOption {
             type = attrsOf (submodule {
               options.encryptionKey = mkOption {