From 6de8c252c595e45b98b2afcee7352c4e34c7d764 Mon Sep 17 00:00:00 2001 From: noe Date: Sat, 6 Jan 2024 13:32:27 -0500 Subject: [PATCH] ingress-proxy: refactor vhosts --- nixos/hosts/ingress-proxy/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/ingress-proxy/default.nix b/nixos/hosts/ingress-proxy/default.nix index 679cf50..b9412bd 100644 --- a/nixos/hosts/ingress-proxy/default.nix +++ b/nixos/hosts/ingress-proxy/default.nix @@ -24,7 +24,12 @@ in { }; virtualHosts = let - static = { src ? null, url ? null, rev ? null, aliases ? [], name }: { + 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 { http2 = true; http3 = true; forceSSL = true; @@ -33,7 +38,8 @@ in { serverAliases = aliases; root = pkgs.stdenvNoCC.mkDerivation { - src = if src then src else builtins.fetchGit { inherit url rev name; }; + inherit name'; + src = if src then src else builtins.fetchGit { inherit url rev; }; installPhase = "cp -r $src $out"; }; };