diff options
author | Joel <joel@joel.tokyo> | 2022-12-18 17:19:33 +1000 |
---|---|---|
committer | Joel <joel@joel.tokyo> | 2022-12-30 20:54:06 +1000 |
commit | 4c365aa9fc8823ec420cf8a5b4e4f892ec6d5c4a (patch) | |
tree | 16b52ceafd2e68f196ed973683cc88301390f339 /nixos/modules/services | |
parent | 1cee5ecfebfa99b99fcbf43e2dc1432a2e81b908 (diff) |
nixos/cloudfared: fix options that are required having defaults
> ERR Couldn't start tunnel error="The last ingress rule must match all URLs (i.e. it should not have a hostname or path filter)"
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/networking/cloudflared.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index 747dbc6e8bbe9..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}" ({ + 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; |