From aaf9651ef26f0c2e23d0e0d742845c07a3ce3064 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Fri, 31 May 2024 11:54:56 +0200
Subject: [PATCH] tailscale/nginx: fix

---
 system/nixos/nginx-mediaserver.nix | 5 +++++
 system/nixos/tailscale-nodns.nix   | 3 +--
 system/nixos/tailscale-router.nix  | 3 +--
 system/nixos/tailscale.nix         | 3 +--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/system/nixos/nginx-mediaserver.nix b/system/nixos/nginx-mediaserver.nix
index f4a7784..1d61fa3 100644
--- a/system/nixos/nginx-mediaserver.nix
+++ b/system/nixos/nginx-mediaserver.nix
@@ -2,6 +2,11 @@
 
 {
   services.nginx = {
+    package = lib.mkForce (pkgs.nginxQuic.override {
+      withKTLS = true;
+      withImageFilter = true;
+    });
+
     additionalModules = with pkgs.nginxModules; [
       vod
     ];
diff --git a/system/nixos/tailscale-nodns.nix b/system/nixos/tailscale-nodns.nix
index e2141a5..da81941 100644
--- a/system/nixos/tailscale-nodns.nix
+++ b/system/nixos/tailscale-nodns.nix
@@ -1,6 +1,5 @@
 {
   services.tailscale.extraUpFlags = [
-    "--accept-dns"
-    "false"
+    "--accept-dns=false"
   ];
 }
diff --git a/system/nixos/tailscale-router.nix b/system/nixos/tailscale-router.nix
index d44362c..ff75cfd 100644
--- a/system/nixos/tailscale-router.nix
+++ b/system/nixos/tailscale-router.nix
@@ -7,8 +7,7 @@
     useRoutingFeatures = "server";
 
     extraUpFlags = [
-      "--advertise-routes"
-      "10.0.0.0/24"
+      "--advertise-routes=10.0.0.0/24"
     ];
   };
 }
diff --git a/system/nixos/tailscale.nix b/system/nixos/tailscale.nix
index 1c2fc5c..16132cf 100644
--- a/system/nixos/tailscale.nix
+++ b/system/nixos/tailscale.nix
@@ -11,8 +11,7 @@ in
     authKeyFile = config.age.secrets.tailscale-authkey.path;
 
     extraUpFlags = [
-      "--login-server"
-      headscale
+      "--login-server=${headscale}"
       "--stateful-filtering"
     ];
   };