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)"
This commit is contained in:
Joel
2022-12-30 20:54:06 +10:00
parent 1cee5ecfeb
commit 4c365aa9fc
@@ -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;