JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #277189 from anpin/fix/cloudflared-service

Browse Source 
cloudflared: fixed missing configuration options
This commit is contained in:
Peder Bergebakken Sundt 2024-02-10 12:45:08 +01:00 committed by GitHub
commit 5caded32fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/networking/cloudflared.nix
View File

@ -276,9 +276,11 @@ in
ingressesSet = filterIngressSet tunnel.ingress; ingressesSet = filterIngressSet tunnel.ingress;
ingressesStr = filterIngressStr tunnel.ingress; ingressesStr = filterIngressStr tunnel.ingress;
fullConfig = { fullConfig = filterConfig {
tunnel = name; tunnel = name;
"credentials-file" = tunnel.credentialsFile; "credentials-file" = tunnel.credentialsFile;
warp-routing = filterConfig tunnel.warp-routing;
originRequest = filterConfig tunnel.originRequest;
ingress = ingress =
(map (map
(key: { (key: {
@ -294,6 +296,7 @@ in
(attrNames ingressesStr)) (attrNames ingressesStr))
++ [{ service = tunnel.default; }]; ++ [{ service = tunnel.default; }];
}; };
mkConfigFile = pkgs.writeText "cloudflared.yml" (builtins.toJSON fullConfig); mkConfigFile = pkgs.writeText "cloudflared.yml" (builtins.toJSON fullConfig);
in in
nameValuePair "cloudflared-tunnel-${name}" ({ nameValuePair "cloudflared-tunnel-${name}" ({
@ -322,5 +325,5 @@ in
}; };
}; };
meta.maintainers = with maintainers; [ bbigras ]; meta.maintainers = with maintainers; [ bbigras anpin ];
} }