pyrox.dev
Merge pull request #310350 from oddlama/fix-oauth2-proxy
nixos/oauth2-proxy: fix invalid comparison between list and attrset
+3
-3
nixos/modules/services/security/oauth2-proxy-nginx.nix
+3
-3
nixos/modules/services/security/oauth2-proxy-nginx.nix
···
64
64
};
65
65
};
66
66
67
-
config.services.oauth2-proxy = lib.mkIf (cfg.virtualHosts != [] && (lib.hasPrefix "127.0.0.1:" cfg.proxy)) {
67
+
config.services.oauth2-proxy = lib.mkIf (cfg.virtualHosts != {} && (lib.hasPrefix "127.0.0.1:" cfg.proxy)) {
68
68
enable = true;
69
69
};
70
70
71
-
config.services.nginx = lib.mkIf (cfg.virtualHosts != [] && config.services.oauth2-proxy.enable) (lib.mkMerge ([
71
+
config.services.nginx = lib.mkIf (cfg.virtualHosts != {} && config.services.oauth2-proxy.enable) (lib.mkMerge ([
72
72
{
73
73
virtualHosts.${cfg.domain}.locations."/oauth2/" = {
74
74
proxyPass = cfg.proxy;
···
78
78
'';
79
79
};
80
80
}
81
-
] ++ lib.optional (cfg.virtualHosts != []) {
81
+
] ++ lib.optional (cfg.virtualHosts != {}) {
82
82
recommendedProxySettings = true; # needed because duplicate headers
83
83
} ++ (lib.mapAttrsToList (vhost: conf: {
84
84
virtualHosts.${vhost} = {