From 7acccafa90bf79ff375acffc45cf3398d5e74cb4 Mon Sep 17 00:00:00 2001 From: noe Date: Sat, 6 Jan 2024 13:34:36 -0500 Subject: [PATCH] ingress-proxy: refactor vhosts --- nixos/hosts/ingress-proxy/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/nixos/hosts/ingress-proxy/default.nix b/nixos/hosts/ingress-proxy/default.nix index 204be29..d9f5423 100644 --- a/nixos/hosts/ingress-proxy/default.nix +++ b/nixos/hosts/ingress-proxy/default.nix @@ -24,12 +24,7 @@ in { }; virtualHosts = let - static = { src ? null, url ? null, rev ? null, aliases ? [], name ? null }: - let name' = if name == null then - if src != null then src.name else url - else - name; - in { + static = { src ? null, url ? null, rev ? null, aliases ? [] }: { http2 = true; http3 = true; forceSSL = true; @@ -37,11 +32,7 @@ in { serverAliases = aliases; - root = pkgs.stdenvNoCC.mkDerivation { - name = name'; - src = if src != null then src else builtins.fetchGit { inherit url rev; }; - installPhase = "cp -r $src $out"; - }; + root = if src != null then src else builtins.fetchGit { inherit url rev; }; }; in { # Matrix (main)