From 5d5dabcdb05d73ede3ac20d028d4803fadf71e06 Mon Sep 17 00:00:00 2001
From: Alex Emmet <111742636+Alex-Emmet@users.noreply.github.com>
Date: Mon, 20 Jul 2026 23:27:40 +0200
Subject: [PATCH] [Fix] flake & .pems

---
 flake.nix                           | 28 +++++++---------------------
 src/transport/omikron_connection.rs |  4 ++--
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6e40316..1d48d42 100644
--- a/flake.nix
+++ b/flake.nix
@@ -110,24 +110,14 @@
                 description = "Directory where Omega stores its data and reads certificates from.";
               };
 
-              apiCertFile = lib.mkOption {
+              certFile = lib.mkOption {
                 type = lib.types.path;
-                description = "Path to the SSL certificate file for the web/API server (e.g. ACME fullchain.pem). Copied to server_cert.pem at runtime.";
+                description = "Path to the SSL certificate file (e.g. ACME fullchain.pem). Copied to cert.pem at runtime.";
               };
 
-              apiKeyFile = lib.mkOption {
+              keyFile = lib.mkOption {
                 type = lib.types.path;
-                description = "Path to the SSL private key file for the web/API server (e.g. ACME key.pem). Converted to PKCS#8 and copied to server_key.pem at runtime.";
-              };
-
-              transportCertFile = lib.mkOption {
-                type = lib.types.path;
-                description = "Path to the SSL certificate file for the MTP/QUIC transport (e.g. ACME fullchain.pem). Copied to transport_cert.pem at runtime.";
-              };
-
-              transportKeyFile = lib.mkOption {
-                type = lib.types.path;
-                description = "Path to the SSL private key file for the MTP/QUIC transport (e.g. ACME key.pem). Converted to PKCS#8 and copied to transport_key.pem at runtime.";
+                description = "Path to the SSL private key file (e.g. ACME key.pem). Converted to PKCS#8 and copied to key.pem at runtime.";
               };
 
               environmentFiles = lib.mkOption {
@@ -211,14 +201,10 @@
                       "+"
                       + pkgs.writeShellScript "omega-setup-certs" ''
                         mkdir -p ${cfg.dataDir}/certs
-                        cp ${cfg.apiCertFile} ${cfg.dataDir}/certs/server_cert.pem
+                        cp ${cfg.certFile} ${cfg.dataDir}/certs/cert.pem
                         ${pkgs.openssl}/bin/openssl pkcs8 -topk8 -nocrypt \
-                          -in ${cfg.apiKeyFile} \
-                          -out ${cfg.dataDir}/certs/server_key.pem
-                        cp ${cfg.transportCertFile} ${cfg.dataDir}/certs/transport_cert.pem
-                        ${pkgs.openssl}/bin/openssl pkcs8 -topk8 -nocrypt \
-                          -in ${cfg.transportKeyFile} \
-                          -out ${cfg.dataDir}/certs/transport_key.pem
+                          -in ${cfg.keyFile} \
+                          -out ${cfg.dataDir}/certs/key.pem
                         chown -R omega:omega ${cfg.dataDir}
                       ''
                     )
diff --git a/src/transport/omikron_connection.rs b/src/transport/omikron_connection.rs
index b2b01b3..7095f9d 100644
--- a/src/transport/omikron_connection.rs
+++ b/src/transport/omikron_connection.rs
@@ -257,8 +257,8 @@ pub async fn complete_register(_: PublicKeyBundle, _: Option<String>) -> u64 {
 }
 
 pub async fn start(port: u16) -> Result<(), Box<dyn std::error::Error>> {
-    let cert_pem = load_file_vec("certs", "transport_cert.pem")?;
-    let key_pem = load_file_vec("certs", "transport_key.pem")?;
+    let cert_pem = load_file_vec("certs", "cert.pem")?;
+    let key_pem = load_file_vec("certs", "key.pem")?;
     let web_config = server::server::build_web_config()?;
     let host_config = HostConfig::new(
         IpAddr::from(Ipv4Addr::new(0, 0, 0, 0)),