From e803e6a02a657993d0253d1cc7e4205ff59a5c9a Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Mon, 5 May 2025 20:34:24 +0000 Subject: [PATCH] fix for cloudflare-dyndns using noproxy fix as well --- .../presets/services/cloudflare/cloudflare.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/platforms/nixos/modules/nmasur/presets/services/cloudflare/cloudflare.nix b/platforms/nixos/modules/nmasur/presets/services/cloudflare/cloudflare.nix index 8365184..06aacf9 100644 --- a/platforms/nixos/modules/nmasur/presets/services/cloudflare/cloudflare.nix +++ b/platforms/nixos/modules/nmasur/presets/services/cloudflare/cloudflare.nix @@ -157,6 +157,19 @@ in systemd.services.cloudflare-dyndns = lib.mkIf config.services.cloudflare-dyndns.enable { after = [ "cloudflare-api-secret.service" ]; requires = [ "cloudflare-api-secret.service" ]; + script = + let + args = + [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ] + ++ (if config.services.cloudflare-dyndns.ipv4 then [ "-4" ] else [ "-no-4" ]) + ++ (if config.services.cloudflare-dyndns.ipv6 then [ "-6" ] else [ "-no-6" ]) + ++ lib.optional config.services.cloudflare-dyndns.deleteMissing "--delete-missing" + ++ lib.optional config.services.cloudflare-dyndns.proxied "--proxied"; + in + lib.mkForce '' + export CLOUDFLARE_API_TOKEN=$(cat ''${CREDENTIALS_DIRECTORY}/apiToken) + exec ${lib.getExe pkgs.cloudflare-dyndns} ${toString args} + ''; }; # Enable the home-made service that we created for non-proxied records