From cac7aedbbac0706588f72d2296cef0f4a842cc40 Mon Sep 17 00:00:00 2001
From: wi11-holdsworth <83637728+wi11-holdsworth@users.noreply.github.com>
Date: Wed, 22 Oct 2025 18:07:43 +1100
Subject: [PATCH] fix: pass port into owntracks-recorder config as a string,
 not an int

---
 modules/nixos/features/owntracks.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/nixos/features/owntracks.nix b/modules/nixos/features/owntracks.nix
index eac7cfe..3f20127 100644
--- a/modules/nixos/features/owntracks.nix
+++ b/modules/nixos/features/owntracks.nix
@@ -1,8 +1,5 @@
 {
-  # keep-sorted start
-  lib,
   pkgs,
-  # keep-sorted end
   ...
 }:
 let
@@ -18,7 +15,7 @@ in
         ${pkgs.owntracks-recorder}/bin/ot-recorder \
            --storage /var/lib/owntracks/recorder/store \
            --port 0
-           --http-port ${lib.toInt port}
+           --http-port ${port}
            --http-host https://${host}
       '';
       DynamicUser = true;
@@ -30,10 +27,15 @@ in
   services = {
     # borgbackup.jobs = owntracks { };
 
-    nginx.virtualHosts.${host} = {
-      forceSSL = true;
-      useACMEHost = "fi33.buzz";
-      locations."/".proxyPass = "http://localhost:${port}";
-    };
+    nginx.virtualHosts.${host} =
+      let
+        owntracks-frontend = pkgs.callPackage ./owntracks-frontend.nix;
+      in
+      {
+        forceSSL = true;
+        useACMEHost = "fi33.buzz";
+        root = "/var/www/html";
+        locations."/owntracks/".alias = "${owntracks-frontend}";
+      };
   };
 }