about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorPavel Anpin <pavel@anpin.fyi>2023-12-27 22:50:00 +0100
committerPavel Anpin <pavel@anpin.fyi>2023-12-27 22:50:00 +0100
commit3ca696729b25b9adc71040237bcacf0125d156d1 (patch)
treef4741fb5c73d56683cfde358fda1f640ed1afd56 /nixos/modules/services
parent6df37dc6a77654682fe9f071c62b4242b5342e04 (diff)
downloadnixlib-3ca696729b25b9adc71040237bcacf0125d156d1.tar
nixlib-3ca696729b25b9adc71040237bcacf0125d156d1.tar.gz
nixlib-3ca696729b25b9adc71040237bcacf0125d156d1.tar.bz2
nixlib-3ca696729b25b9adc71040237bcacf0125d156d1.tar.lz
nixlib-3ca696729b25b9adc71040237bcacf0125d156d1.tar.xz
nixlib-3ca696729b25b9adc71040237bcacf0125d156d1.tar.zst
nixlib-3ca696729b25b9adc71040237bcacf0125d156d1.zip
cloudflared: fixed missing configuration options
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/networking/cloudflared.nix7
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 ];
 }