Merge pull request #75 from naturallaw777/copilot/revert-commit-7c047a1

[WIP] Revert changes breaking local LAN access to Hub, RTL, and Mempool

iso/installer.py

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

modules/core/caddy.nix

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

modules/core/sovran-hub.nix

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