Compare commits

6 Commits

Author SHA1 Message Date
Sovran_Systems
ca11cbbc79 Merge pull request #75 from naturallaw777/copilot/revert-commit-7c047a1
[WIP] Revert changes breaking local LAN access to Hub, RTL, and Mempool
2026-04-05 09:44:19 -05:00
copilot-swe-agent[bot]
6584b63c36 Revert commit 7c047a1: restore LAN access to Hub, RTL, and Mempool
Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/c92f1a7f-7c42-44f1-a86d-089383bafc94

Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
2026-04-05 14:43:49 +00:00
Sovran_Systems
88cac6c1e9 Merge pull request #74 from naturallaw777/copilot/fix-disko-command-error
Fix disko ESP mount failure on dual-NVMe by splitting destroy/format into sequential calls
2026-04-05 09:42:51 -05:00
copilot-swe-agent[bot]
ef39040919 Initial plan 2026-04-05 14:42:36 +00:00
copilot-swe-agent[bot]
ca275c45de Fix disko mount failure by splitting destroy and format,mount into separate calls
Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/0f9fe8d2-554e-4048-9dba-5a3c3c663410

Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
2026-04-05 14:41:16 +00:00
copilot-swe-agent[bot]
fee6035de0 Initial plan 2026-04-05 14:40:22 +00:00
3 changed files with 18 additions and 6 deletions

View File

@@ -730,15 +730,25 @@ class InstallerWindow(Adw.ApplicationWindow):
# ── Now run disko on a clean disk ── # ── Now run disko on a clean disk ──
GLib.idle_add(append_text, buf, "\n=== Partitioning drives ===\n") GLib.idle_add(append_text, buf, "\n=== Partitioning drives ===\n")
cmd = [ cmd_destroy = [
"sudo", "disko", "--mode", "destroy,format,mount", "sudo", "disko", "--mode", "destroy",
"--yes-wipe-all-disks", "--yes-wipe-all-disks",
f"{FLAKE}/iso/disko.nix", f"{FLAKE}/iso/disko.nix",
"--arg", "device", boot_path "--arg", "device", boot_path
] ]
if data_path: if data_path:
cmd += ["--arg", "dataDevice", data_path] cmd_destroy += ["--arg", "dataDevice", data_path]
run_stream(cmd, buf) run_stream(cmd_destroy, buf)
GLib.idle_add(append_text, buf, "\n=== Formatting and mounting drives ===\n")
cmd_format = [
"sudo", "disko", "--mode", "format,mount",
f"{FLAKE}/iso/disko.nix",
"--arg", "device", boot_path
]
if data_path:
cmd_format += ["--arg", "dataDevice", data_path]
run_stream(cmd_format, buf)
GLib.idle_add(append_text, buf, "\n=== Generating hardware config ===\n") GLib.idle_add(append_text, buf, "\n=== Generating hardware config ===\n")
run_stream(["sudo", "nixos-generate-config", "--root", "/mnt"], buf) run_stream(["sudo", "nixos-generate-config", "--root", "/mnt"], buf)

View File

@@ -156,7 +156,7 @@ EOF
# RTL (LAN access) # RTL (LAN access)
cat >> /run/caddy/Caddyfile <<EOF cat >> /run/caddy/Caddyfile <<EOF
http://127.0.0.1:3051, http://sovransystemsos.local:3051 { :3051 {
reverse_proxy :3050 reverse_proxy :3050
encode gzip zstd encode gzip zstd
} }
@@ -165,7 +165,7 @@ EOF
# Mempool (LAN access) # Mempool (LAN access)
cat >> /run/caddy/Caddyfile <<EOF cat >> /run/caddy/Caddyfile <<EOF
http://127.0.0.1:60847, http://sovransystemsos.local:60847 { :60847 {
reverse_proxy :60845 reverse_proxy :60845
encode gzip zstd encode gzip zstd
} }

View File

@@ -293,5 +293,7 @@ in
}; };
}; };
networking.firewall.allowedTCPPorts = [ 3051 8937 60847 ];
}; };
} }