From 65208987ea7aa19a82b84e8cace5aad246cd86a5 Mon Sep 17 00:00:00 2001
From: ducoterra <git@ducoterra.net>
Date: Fri, 6 Feb 2026 20:23:12 -0500
Subject: [PATCH] update osbuild with more default packages

---
 active/software_osbuild/fedora43-base.toml | 57 +++++++++++++++-------
 active/software_osbuild/image_builder.md   |  2 +-
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/active/software_osbuild/fedora43-base.toml b/active/software_osbuild/fedora43-base.toml
index 8456507..16f0f75 100644
--- a/active/software_osbuild/fedora43-base.toml
+++ b/active/software_osbuild/fedora43-base.toml
@@ -1,12 +1,15 @@
-name = "fedora-43-base"
-description = "Fedora 43 Base Installation"
-version = "0.0.1"
+name = "fedora43-base"
+description = "Fedora Base Installation"
+version = "0.2.2"
 distro = "fedora-43"
 modules = []
 groups = []
 
 [customizations]
-hostname = "f43-base"
+hostname = "fedora43-base"
+
+[customizations.timezone]
+timezone = "America/New_York"
 
 [[customizations.disk.partitions]]
 type = "plain"
@@ -15,23 +18,11 @@ mountpoint = "/"
 fs_type = "ext4"
 minsize = "128 GiB"
 
-[customizations.timezone]
-timezone = "America/New_York"
-
-[[customizations.user]]
-name = "ducoterra"
-password = "$6$QqOw6ktp6aiPy5kX$cpN.oar4CiofH0PpxyveJgkjsRFGnZ5ykOX/50DcJyU3hZFxc5R3SASemNW6m3jceLGgZrQHyALQl8SgtcNO90"
-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGQa781Qj8mNlUdRquFFqg0O2ornG9SBHe705y4+1vPI ssh@ducoterra.net"
-home = "/home/ducoterra/"
-shell = "/usr/bin/bash"
-groups = ["wheel"]
-uid = 1000
-
 [customizations.firewall.services]
-enabled = ["ssh"]
+enabled = ["ssh", "cockpit"]
 
 [customizations.services]
-enabled = ["sshd"]
+enabled = ["sshd", "cockpit.socket"]
 
 [[packages]]
 name = "bash-completion"
@@ -53,6 +44,18 @@ version = "*"
 name = "git"
 version = "*"
 
+[[packages]]
+name = "cockpit"
+version = "*"
+
+[[packages]]
+name = "borgbackup"
+version = "*"
+
+[[packages]]
+name = "policycoreutils-python-utils"
+version = "*"
+
 [[customizations.files]]
 path = "/root/.inputrc"
 mode = "0644"
@@ -62,6 +65,24 @@ data = """
 "\\C-h": backward-kill-word
 """
 
+[[customizations.files]]
+path = "/root/.ssh/authorized_keys"
+mode = "0600"
+user = "root"
+group = "root"
+data = """
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGQa781Qj8mNlUdRquFFqg0O2ornG9SBHe705y4+1vPI ssh@ducoterra.net
+"""
+
+[[customizations.user]]
+name = "ducoterra"
+password = "$6$QqOw6ktp6aiPy5kX$cpN.oar4CiofH0PpxyveJgkjsRFGnZ5ykOX/50DcJyU3hZFxc5R3SASemNW6m3jceLGgZrQHyALQl8SgtcNO90"
+key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGQa781Qj8mNlUdRquFFqg0O2ornG9SBHe705y4+1vPI ssh@ducoterra.net"
+home = "/home/ducoterra/"
+shell = "/usr/bin/bash"
+groups = ["wheel"]
+uid = 1000
+
 [[customizations.files]]
 path = "/home/ducoterra/.inputrc"
 mode = "0644"
diff --git a/active/software_osbuild/image_builder.md b/active/software_osbuild/image_builder.md
index 47e252e..7de43b1 100644
--- a/active/software_osbuild/image_builder.md
+++ b/active/software_osbuild/image_builder.md
@@ -82,7 +82,7 @@ dnf install openscap-scanner scap-security-guide
     composer-cli compose list finished
 
     # Download the image
-    composer-cli compose image --filename active/software_osbuild/secrets/fedora43-base.qcow2 image-uuid
+    composer-cli compose image --filename active/software_osbuild/secrets/fedora43-base.qcow2 1884d6a3-0b13-40e1-980d-1941f9a4c4f9
 
     # Test with qemu
     virt-install \