Merge pull request #66 from naturallaw777/copilot/update-installer-for-desktop-only

Desktop Only: enforce 128 GB boot disk minimum, skip data disk logic

app/sovran_systemsos_web/server.py

@@ -192,6 +192,21 @@ FEATURE_REGISTRY = [
         "conflicts_with": ["bip110"],
         "port_requirements": [],
     },
+    {
+        "id": "btcpay-web",
+        "name": "BTCPay Server Web Access",
+        "description": "Expose BTCPay Server to the internet via your domain. When disabled, BTCPay Server still runs locally but is not accessible from the web.",
+        "category": "bitcoin",
+        "needs_domain": True,
+        "domain_name": "btcpayserver",
+        "needs_ddns": True,
+        "extra_fields": [],
+        "conflicts_with": [],
+        "port_requirements": [
+            {"port": "80",  "protocol": "TCP", "description": "HTTP (redirect to HTTPS)"},
+            {"port": "443", "protocol": "TCP", "description": "HTTPS"},
+        ],
+    },
 ]
 
 # Map feature IDs to their systemd units in config.json
@@ -202,6 +217,7 @@ FEATURE_SERVICE_MAP = {
     "mempool": "mempool.service",
     "bip110": None,
     "bitcoin-core": None,
+    "btcpay-web": "btcpayserver.service",
 }
 
 # Port requirements for service tiles (keyed by unit name or icon)
@@ -270,7 +286,7 @@ ROLE_CATEGORIES: dict[str, set[str] | None] = {
 ROLE_FEATURES: dict[str, set[str] | None] = {
     "server_plus_desktop": None,
     "desktop":             {"rdp"},
-    "node":                {"rdp", "bip110", "bitcoin-core", "mempool"},
+    "node":                {"rdp", "bip110", "bitcoin-core", "mempool", "btcpay-web"},
 }
 
 SERVICE_DESCRIPTIONS: dict[str, str] = {
@@ -932,6 +948,11 @@ def _read_hub_overrides() -> tuple[dict, str | None]:
             section,
         ):
             features[m.group(1)] = m.group(2) == "true"
+        for m in re.finditer(
+            r'sovran_systemsOS\.web\.btcpayserver\s*=\s*(?:lib\.mkForce\s+)?(true|false)\s*;',
+            section,
+        ):
+            features["btcpay-web"] = m.group(1) == "true"
         m2 = re.search(
             r'sovran_systemsOS\.nostr_npub\s*=\s*(?:lib\.mkForce\s+)?"([^"]*)"',
             section,
@@ -948,6 +969,9 @@ def _write_hub_overrides(features: dict, nostr_npub: str | None) -> None:
     lines = []
     for feat_id, enabled in features.items():
         val = "true" if enabled else "false"
+        if feat_id == "btcpay-web":
+            lines.append(f"  sovran_systemsOS.web.btcpayserver = lib.mkForce {val};")
+        else:
             lines.append(f"  sovran_systemsOS.features.{feat_id} = lib.mkForce {val};")
     if nostr_npub:
         lines.append(f'  sovran_systemsOS.nostr_npub = lib.mkForce "{nostr_npub}";')
@@ -990,6 +1014,8 @@ def _write_hub_overrides(features: dict, nostr_npub: str | None) -> None:
 def _is_feature_enabled_in_config(feature_id: str) -> bool | None:
     """Check if a feature's service appears as enabled in the running config.json.
     Returns True/False if found, None if the feature has no mapped service."""
+    if feature_id == "btcpay-web":
+        return False  # Default off in Node role; only on via explicit hub toggle
     unit = FEATURE_SERVICE_MAP.get(feature_id)
     if unit is None:
         return None  # bip110, bitcoin-core — can't determine from config

iso/installer.py

@@ -501,8 +501,17 @@ class InstallerWindow(Adw.ApplicationWindow):
         self.boot_disk, self.boot_size = disks[0]
         self.data_disk, self.data_size = None, None
 
+        BYTES_128GB = 128 * 1024 ** 3
+        if self.role == "Desktop Only" and self.boot_size < BYTES_128GB:
+            self.show_error(
+                f"Boot disk /dev/{self.boot_disk} is only "
+                f"{human_size(self.boot_size)}.  "
+                f"The Desktop Only role requires at least 128 GB."
+            )
+            return
+
         BYTES_2TB = 2 * 1024 ** 4
-        if len(disks) >= 2:
+        if self.role != "Desktop Only" and len(disks) >= 2:
             d, s = disks[-1]
             if s >= BYTES_2TB:
                 self.data_disk, self.data_size = d, s
@@ -528,7 +537,7 @@ class InstallerWindow(Adw.ApplicationWindow):
             data_row.set_subtitle(f"/dev/{self.data_disk}  —  {human_size(self.data_size)}")
             data_row.add_prefix(symbolic_icon("drive-harddisk-symbolic"))
             disk_group.add(data_row)
-        else:
+        elif self.role != "Desktop Only":
             no_row = Adw.ActionRow()
             no_row.set_title("Data Disk")
             no_row.set_subtitle("None detected  (requires 2 TB or larger)")