services(cloudflare-dyndns): use new CLOUDFLARE_API_TOKEN_FILE setting (#401634)

2025-04-26 15:20:44 -04:00
parent e5caadfb0d 7161a83931
commit ae0f2bc1a3
1 changed files with 3 additions and 2 deletions
@@ -108,13 +108,14 @@ in
              ++ lib.optional cfg.proxied "--proxied";
          in
          ''
-            export CLOUDFLARE_API_TOKEN=$(< "''${CREDENTIALS_DIRECTORY}/apiToken")
+            export CLOUDFLARE_API_TOKEN_FILE=''${CREDENTIALS_DIRECTORY}/apiToken

            # Added 2025-03-10: `cfg.apiTokenFile` used to be passed as an
            # `EnvironmentFile` to the service, which required it to be of
            # the form "CLOUDFLARE_API_TOKEN=" rather than just the secret.
            # If we detect this legacy usage, error out.
-            if [[ $CLOUDFLARE_API_TOKEN == CLOUDFLARE_API_TOKEN* ]]; then
+            token=$(< "''${CLOUDFLARE_API_TOKEN_FILE}")
+            if [[ $token == CLOUDFLARE_API_TOKEN* ]]; then
              echo "Error: your api token starts with 'CLOUDFLARE_API_TOKEN='. Remove that, and instead specify just the token." >&2
              exit 1
            fi