diff options
author | 0x4A6F <0x4A6F@users.noreply.github.com> | 2022-12-30 17:30:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-30 17:30:51 +0100 |
commit | 3b67e9f841862de8bea01698cfba0507c6c6374f (patch) | |
tree | 73e2755772b8042653c7f716c24f01fcdad416df /nixos/modules/services | |
parent | dea47fa228a4befa22bdda738f6348dd8a41e22c (diff) | |
parent | 4c365aa9fc8823ec420cf8a5b4e4f892ec6d5c4a (diff) |
Merge pull request #206674 from jyooru/fix/nixos/cloudflared
nixos/cloudflared: fix invalid systemd unit, required options with defaults
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/networking/cloudflared.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index c8fc9fafee6dc..3ee43072ba861 100644 --- a/nixos/modules/services/networking/cloudflared.nix +++ b/nixos/modules/services/networking/cloudflared.nix @@ -168,8 +168,7 @@ in inherit originRequest; credentialsFile = mkOption { - type = with types; nullOr str; - default = null; + type = types.str; description = lib.mdDoc '' Credential file. @@ -190,8 +189,7 @@ in }; default = mkOption { - type = with types; nullOr str; - default = null; + type = types.str; description = lib.mdDoc '' Catch-all service if no ingress matches. @@ -262,12 +260,12 @@ in systemd.targets = mapAttrs' (name: tunnel: - nameValuePair "cloudflared-tunnel-${name}" ({ - description = lib.mdDoc "Cloudflare tunnel '${name}' target"; + nameValuePair "cloudflared-tunnel-${name}" { + description = "Cloudflare tunnel '${name}' target"; requires = [ "cloudflared-tunnel-${name}.service" ]; after = [ "cloudflared-tunnel-${name}.service" ]; unitConfig.StopWhenUnneeded = true; - }) + } ) config.services.cloudflared.tunnels; |