diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-02-10 12:45:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 12:45:08 +0100 |
| commit | 5caded32fef3c2fcf9b8a7d8daf558c4ffb7a34f (patch) | |
| tree | 6415a2ffd3a8bb55b58a632f4b9717ef261a6a5f /nixos | |
| parent | 3fabedcc89e9cab4217672b6a864d5593139d928 (diff) | |
| parent | 3ca696729b25b9adc71040237bcacf0125d156d1 (diff) | |
| download | nixlib-5caded32fef3c2fcf9b8a7d8daf558c4ffb7a34f.tar nixlib-5caded32fef3c2fcf9b8a7d8daf558c4ffb7a34f.tar.gz nixlib-5caded32fef3c2fcf9b8a7d8daf558c4ffb7a34f.tar.bz2 nixlib-5caded32fef3c2fcf9b8a7d8daf558c4ffb7a34f.tar.lz nixlib-5caded32fef3c2fcf9b8a7d8daf558c4ffb7a34f.tar.xz nixlib-5caded32fef3c2fcf9b8a7d8daf558c4ffb7a34f.tar.zst nixlib-5caded32fef3c2fcf9b8a7d8daf558c4ffb7a34f.zip | |
Merge pull request #277189 from anpin/fix/cloudflared-service
cloudflared: fixed missing configuration options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/cloudflared.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index 80c60fdb8013..b9556bfa60d0 100644 --- a/nixos/modules/services/networking/cloudflared.nix +++ b/nixos/modules/services/networking/cloudflared.nix @@ -276,9 +276,11 @@ in ingressesSet = filterIngressSet tunnel.ingress; ingressesStr = filterIngressStr tunnel.ingress; - fullConfig = { + fullConfig = filterConfig { tunnel = name; "credentials-file" = tunnel.credentialsFile; + warp-routing = filterConfig tunnel.warp-routing; + originRequest = filterConfig tunnel.originRequest; ingress = (map (key: { @@ -294,6 +296,7 @@ in (attrNames ingressesStr)) ++ [{ service = tunnel.default; }]; }; + mkConfigFile = pkgs.writeText "cloudflared.yml" (builtins.toJSON fullConfig); in nameValuePair "cloudflared-tunnel-${name}" ({ @@ -322,5 +325,5 @@ in }; }; - meta.maintainers = with maintainers; [ bbigras ]; + meta.maintainers = with maintainers; [ bbigras anpin ]; } |