From 3d8320056fcbefaab22aad7bc3e7f58c184136da Mon Sep 17 00:00:00 2001
From: saltydk <salty@salty.dk>
Date: Sat, 29 Jul 2023 02:25:17 +0200
Subject: [PATCH] settings: use old remote_is_defined for upgrade

---
 inventories/group_vars/all.yml                             | 7 +++++++
 .../tasks/subtasks/migrator/settings_yml/migration_01.yml  | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/inventories/group_vars/all.yml b/inventories/group_vars/all.yml
index b860306963..71d8c94fc0 100644
--- a/inventories/group_vars/all.yml
+++ b/inventories/group_vars/all.yml
@@ -65,6 +65,13 @@ rclone_remote_is_defined: "{{ (rclone is defined) and
                               (rclone.remotes is not none) and
                               (rclone.remotes | length > 0) }}"
 
+rclone_old_remote_is_defined: "{{ (rclone is defined) and
+                                  (rclone is not none) and
+                                  (rclone | trim | length > 0) and
+                                  (rclone.remote is defined) and
+                                  (rclone.remote is not none) and
+                                  (rclone.remote | trim | length > 0) }}"
+
 use_cloudplow: "{{ rclone_remote_is_defined and use_remote }}"
 
 use_remote: "{{ rclone.enabled and not continuous_integration }}"
diff --git a/roles/settings/tasks/subtasks/migrator/settings_yml/migration_01.yml b/roles/settings/tasks/subtasks/migrator/settings_yml/migration_01.yml
index 0f816ef841..e03f487aa3 100644
--- a/roles/settings/tasks/subtasks/migrator/settings_yml/migration_01.yml
+++ b/roles/settings/tasks/subtasks/migrator/settings_yml/migration_01.yml
@@ -35,18 +35,18 @@
     yyq e -i '.rclone.remotes += [{"remote": "{{ rclone.remote }}", "template": "google", "cache": {"enabled": false, "size": "50G", "max_age": "504h"}, "port": 5572}]' {{ playbook_dir }}/{{ file }}
   become: true
   become_user: "{{ saltbox_yml.stat.pw_name }}"
-  when: (rclone.remotes is undefined) and rclone_remote_is_defined
+  when: (rclone.remotes is undefined) and rclone_old_remote_is_defined
 
 - name: Migrator | 'settings.yml' | Migration 01 | Create 'rclone.remotes' dict
   ansible.builtin.shell: |
     yyq e -i '.rclone.remotes += [{"remote": "google", "template": "google", "cache": {"enabled": false, "size": "50G", "max_age": "504h"}, "port": 5572}]' {{ playbook_dir }}/{{ file }}
   become: true
   become_user: "{{ saltbox_yml.stat.pw_name }}"
-  when: (rclone.remotes is undefined) and not rclone_remote_is_defined
+  when: (rclone.remotes is undefined) and not rclone_old_remote_is_defined
 
 - name: Migrator | 'settings.yml' | Migration 01 | Create 'rclone.enabled' dict
   ansible.builtin.shell: |
-    yyq e -i '.rclone.enabled = {{ "true" if rclone_remote_is_defined else "false" }}' {{ playbook_dir }}/{{ file }}
+    yyq e -i '.rclone.enabled = {{ "true" if (rclone_old_remote_is_defined or rclone_remote_is_defined) else "false" }}' {{ playbook_dir }}/{{ file }}
   become: true
   become_user: "{{ saltbox_yml.stat.pw_name }}"
   when: (rclone.enabled is undefined)