gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(nginx): use correct xvars

Browse source
This commit is contained in:
arcnmx 2024-04-23 13:55:37 -07:00
parent f286ff4c72
commit 735c18f621
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/nixos/nginx/ssl.nix
View file

@ -10,14 +10,12 @@
inherit (lib.attrsets) mapAttrsToList;
inherit (lib.trivial) warnIf;
inherit (config.services) nginx;
forceRedirectConfig = virtualHost: let
xvars = virtualHost.xvars.lib;
in ''
forceRedirectConfig = { virtualHost, xvars }: ''
if (${xvars.get.scheme} = http) {
return ${toString virtualHost.redirectCode} https://${xvars.get.host}$request_uri;
}
'';
locationModule = { config, virtualHost, ... }: let
locationModule = { config, virtualHost, xvars, ... }: let
cfg = config.ssl;
emitForce = cfg.force && !virtualHost.ssl.forced;
in {
@ -26,7 +24,7 @@
};
config = {
xvars.enable = mkIf emitForce true;
extraConfig = mkIf emitForce (forceRedirectConfig virtualHost);
extraConfig = mkIf emitForce (forceRedirectConfig { inherit xvars virtualHost; });
};
};
sslModule = { config, name, ... }: let
@ -87,7 +85,7 @@
};
};
};
hostModule = { config, name, ... }: let
hostModule = { config, name, xvars, ... }: let
cfg = config.ssl;
emitForce = cfg.forced && config.proxied.enabled;
in {
@ -123,7 +121,7 @@
kTLS = mkAlmostOptionDefault true;
xvars.enable = mkIf emitForce true;
extraConfig = mkIf emitForce (forceRedirectConfig config);
extraConfig = mkIf emitForce (forceRedirectConfig { virtualHost = config; inherit xvars; });
};
};
upstreamServerModule = { config, nixosConfig, ... }: let