Unverified Commit 5caded32 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

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

cloudflared: fixed missing configuration options
parents 3fabedcc 3ca69672
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -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 ];
}