fix(nginx): proxied var defaults

This commit is contained in:
arcnmx 2024-08-11 13:36:59 -07:00
parent 914676f884
commit bd78e75619
2 changed files with 16 additions and 0 deletions

View file

@ -9,6 +9,10 @@ let
set $proxied_cf on;
set $proxied_host_cf ${host};
'';
xNotCloudflared = ''
set $proxied_cf "";
set $proxied_host_cf "";
'';
xHeadersProxied = {xvars}: ''
${xvars.init "forwarded_for" "$proxy_add_x_forwarded_for"}
if ($http_x_forwarded_proto) {
@ -104,6 +108,9 @@ let
(mkIf (cfg.enable == "cloudflared" && virtualHost.proxied.enable != "cloudflared") (
mkJustBefore (xCloudflared {inherit virtualHost;})
))
(mkIf (cfg.enabled && emitVars && cfg.enable != "cloudflared") (
mkJustBefore xNotCloudflared
))
(mkIf (xInit && emitVars) (
mkJustBefore (xHeadersProxied {inherit xvars;})
))
@ -212,6 +219,9 @@ let
(mkIf (cfg.enable == "cloudflared") (
mkOrder orderJustBefore (xCloudflared {virtualHost = config;})
))
(mkIf (cfg.enabled && cfg.enable != "cloudflared") (
mkOrder orderJustBefore xNotCloudflared
))
(mkIf (xInit && cfg.enabled && config.xvars.enable) (
mkOrder (orderJustBefore + 25) (xHeadersProxied {inherit xvars;})
))