From 850f0b611d4a2a17a39cae33174d4932998d026f Mon Sep 17 00:00:00 2001 From: Kuba Orlik Date: Wed, 3 Jun 2026 23:31:51 +0200 Subject: [PATCH] Rclone don't keep the bucket name in endpoint --- tasks/main.yml | 1 - templates/rclone.conf.j2 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 7e5087a..6fc4b1d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -72,7 +72,6 @@ delay: 3 until: "command_result.rc==0 or 'repository master key and config already initialized' in command_result.stderr" failed_when: "command_result.rc!=0 and 'repository master key and config already initialized' not in command_result.stderr" - changed_when: "false" environment: RESTIC_REPOSITORY: "s3:{{ cloudflare_r2_endpoint }}{{ '' if ((cloudflare_r2_endpoint | urlsplit('path') | default('')) | length >1) else '/' ~ backup_bucket_prefix ~ '-' ~ inventory_hostname }}" AWS_ACCESS_KEY_ID: "{{ cloudflare_r2_access_key }}" diff --git a/templates/rclone.conf.j2 b/templates/rclone.conf.j2 index 4ba9003..3ea0832 100644 --- a/templates/rclone.conf.j2 +++ b/templates/rclone.conf.j2 @@ -4,6 +4,6 @@ provider = Cloudflare access_key_id = {{ cloudflare_r2_access_key }} secret_access_key = {{ cloudflare_r2_secret_key }} region = auto -endpoint = {{ cloudflare_r2_endpoint }} +endpoint = {{ cloudflare_r2_endpoint | regex_replace('/.*$', '') }} bucket_acl = private