fix: restore FIPS as installable container app

FIPS stays in the marketplace as an installable container app.
NostrVPN is the native system service; FIPS is a separate optional app.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

core/archipelago/src/api/rpc/package/config.rs

@@ -124,9 +124,9 @@ pub(super) fn get_app_capabilities(app_id: &str) -> Vec<String> {
             "--cap-add=DAC_OVERRIDE".to_string(),
             "--cap-add=NET_BIND_SERVICE".to_string(),
         ],
-        // Nostr VPN: mesh networking needs TUN + NET_ADMIN
+        // Nostr VPN and FIPS: mesh networking daemons need TUN + NET_ADMIN
         // Note: --device=/dev/net/tun is added separately in install.rs
-        "nostr-vpn" => vec![
+        "nostr-vpn" | "fips" => vec![
             "--cap-add=NET_ADMIN".to_string(),
             "--cap-add=NET_RAW".to_string(),
         ],
@@ -251,6 +251,7 @@ pub(super) fn get_health_check_args(app_id: &str, _rpc_pass: &str) -> Vec<String
             "3",
         ),
         "nostr-vpn" => ("nvpn status || exit 1", "30s", "3"),
+        "fips" => ("fipsctl status || exit 1", "30s", "3"),
         _ => return vec![],
     };
 
@@ -293,6 +294,7 @@ pub(super) fn get_memory_limit(app_id: &str) -> &'static str {
         "nostr-rs-relay" | "nostr-relay" => "256m",
         "routstr" => "512m",
         "nostr-vpn" => "256m",
+        "fips" => "256m",
         "nginx-proxy-manager" => "256m",
         // Databases
         "archy-btcpay-db" | "archy-mempool-db" | "mysql-mempool" => "512m",
@@ -358,6 +360,7 @@ pub(super) fn all_container_names(package_id: &str) -> Vec<String> {
             "penpot-backend".into(), "penpot-exporter".into(), "penpot-frontend".into(),
         ],
         "nostr-vpn" => vec!["nostr-vpn".into(), "archy-nostr-vpn".into(), "archy-nostr-vpn-ui".into()],
+        "fips" => vec!["fips".into(), "archy-fips".into(), "archy-fips-ui".into()],
         "routstr" => vec!["routstr".into(), "archy-routstr".into()],
         // Default: exact name + archy- prefix
         _ => vec![base, archy],
@@ -834,6 +837,27 @@ pub(super) async fn get_app_config(
                 None,
             )
         }
+        "fips" => {
+            let nsec = read_nostr_secret_hex();
+            let mut env = vec![];
+            if !nsec.is_empty() {
+                env.push(format!("FIPS_NSEC={}", nsec));
+                env.push(format!("FIPS_NPUB={}", read_nostr_pubkey_hex()));
+            }
+            (
+                vec![
+                    "2121:2121/udp".to_string(),
+                    "8443:8443".to_string(),
+                ],
+                vec![
+                    "/var/lib/archipelago/fips/config:/etc/fips".to_string(),
+                    "/var/lib/archipelago/fips/run:/run/fips".to_string(),
+                ],
+                env,
+                None,
+                None,
+            )
+        }
         "dwn" => (
             vec!["3100:3000".to_string()],
             vec!["/var/lib/archipelago/dwn:/dwn/data".to_string()],

core/archipelago/src/api/rpc/package/install.rs

@@ -226,7 +226,7 @@ impl RpcHandler {
         }
 
         // TUN device for mesh networking apps
-        if package_id == "nostr-vpn" {
+        if matches!(package_id, "nostr-vpn" | "fips") {
             run_args.push("--device=/dev/net/tun");
         }
 
@@ -265,13 +265,21 @@ impl RpcHandler {
         }
 
         // Pre-install: write Nostr identity key files for headless Nostr-aware apps
-        if package_id == "nostr-vpn" {
+        if matches!(package_id, "nostr-vpn" | "fips") {
             let nostr_secret = std::fs::read_to_string("/var/lib/archipelago/identity/nostr_secret")
                 .map(|s| s.trim().to_string())
                 .unwrap_or_default();
             if !nostr_secret.is_empty() {
-                let key_dir = "/var/lib/archipelago/nostr-vpn";
-                let key_path = format!("{}/nostr_secret", key_dir);
+                let key_dir = match package_id {
+                    "nostr-vpn" => "/var/lib/archipelago/nostr-vpn",
+                    "fips" => "/var/lib/archipelago/fips/config",
+                    _ => unreachable!(),
+                };
+                let key_path = match package_id {
+                    "nostr-vpn" => format!("{}/nostr_secret", key_dir),
+                    "fips" => format!("{}/fips.key", key_dir),
+                    _ => unreachable!(),
+                };
                 tokio::fs::create_dir_all(key_dir).await.ok();
                 tokio::fs::write(&key_path, &nostr_secret).await.ok();
                 // Restrict permissions on key file
@@ -856,6 +864,9 @@ autopilot.active=false\n",
             "nostr-vpn" => {
                 vec![("archy-nostr-vpn-ui", "/opt/archipelago/docker/nostr-vpn-ui", "nostr-vpn-ui")]
             }
+            "fips" => {
+                vec![("archy-fips-ui", "/opt/archipelago/docker/fips-ui", "fips-ui")]
+            }
             _ => vec![],
         };