From cf20a94462ae16aa8fa937cee6584793b15a2186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 25 Mar 2023 16:05:49 +0100 Subject: [PATCH] Cleanup --- hosts/public-access-proxy/default.nix | 1 - hosts/public-access-proxy/proxy.nix | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/public-access-proxy/default.nix b/hosts/public-access-proxy/default.nix index 715bb203..ba6560b4 100644 --- a/hosts/public-access-proxy/default.nix +++ b/hosts/public-access-proxy/default.nix @@ -70,7 +70,6 @@ } { hostNames = [ "gitea.c3d2.de" ]; proxyTo.host = hostRegistry.gitea.ip4; - # proxyProtocol = true; } { hostNames = [ "grafana.hq.c3d2.de" ]; proxyTo.host = hostRegistry.grafana.ip4; diff --git a/hosts/public-access-proxy/proxy.nix b/hosts/public-access-proxy/proxy.nix index 8a124ee9..10010c4c 100644 --- a/hosts/public-access-proxy/proxy.nix +++ b/hosts/public-access-proxy/proxy.nix @@ -117,6 +117,7 @@ in bind :::443 v4v6 tcp-request inspect-delay 5s tcp-request content accept if { req.ssl_hello_type 1 } + ${lib.concatMapStrings ({ proxyTo, hostNames, matchArg, ... }: lib.concatMapStrings (hostname: '' use_backend ${canonicalize proxyTo.host}-https if { req.ssl_sni -i ${matchArg} ${hostname} } @@ -124,6 +125,7 @@ in ) cfg.proxyHosts} ${lib.concatMapStrings ({ proxyTo, proxyProtocol, ... }: '' + backend ${canonicalize proxyTo.host}-https server ${canonicalize proxyTo.host}-https ${proxyTo.host}:${toString proxyTo.httpsPort} weight 1 check ${lib.optionalString proxyProtocol "send-proxy"} '') cfg.proxyHosts}