From 6b7153f919784bf5907cea18afdc83d9ec0598e9 Mon Sep 17 00:00:00 2001
From: "Stefan G. Weichinger" <office@oops.co.at>
Date: Thu, 25 Mar 2021 11:58:26 +0100
Subject: [PATCH] improved handling of local_facts, fix test for binary
 installation (#87)

* improved handling of local_facts, fix test for binary installation

* run config file install as root (#88)

* a block instead of an include

Co-authored-by: theenglishway <33462256+theenglishway@users.noreply.github.com>
---
 tasks/install-config.yml | 17 ----------------
 tasks/main.yml           | 43 ++++++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 tasks/install-config.yml

diff --git a/tasks/install-config.yml b/tasks/install-config.yml
deleted file mode 100644
index 7706c5a..0000000
--- a/tasks/install-config.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-
-- name: Create config directory
-  file:
-    path: '{{ rclone_config_location | dirname }}'
-    state: directory
-    mode: '0700'
-  become: true
-  when: rclone_configs is defined
-
-- name: Set up rclone config
-  template:
-    src: rclone.conf.j2
-    dest: '{{ rclone_config_location }}'
-    mode: 0600
-  become: true
-  when: rclone_configs is defined
diff --git a/tasks/main.yml b/tasks/main.yml
index 71f5a25..a537a35 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,6 +8,19 @@
   tags:
     - vars
 
+- name: Create directory for ansible custom facts
+  ansible.builtin.file:
+    state: directory
+    recurse: true
+    path: /etc/ansible/facts.d
+
+- name: Create facts file from template
+  ansible.builtin.template:
+    src: 'etc/ansible/facts.d/rclone.fact.j2'
+    dest: /etc/ansible/facts.d/rclone.fact
+    mode: '0755'
+  register: rclone__register_facts
+
 - name: Re-read facts after adding custom fact
   become: true
   ansible.builtin.setup:
@@ -45,23 +58,23 @@
 
 - name: Install the binary
   include_tasks: install-bin.yml
-  when: (ansible_facts['ansible_local']['rclone']['installed'] is not true) or (ansible_facts['ansible_local']['rclone']['installed_version'] != rclone_version)
+  when: (((not ansible_local.rclone.installed|d())|bool) or (ansible_local.rclone.installed_version|d("0.0.0")) != rclone_version)
 
-- name: Install the config
-  include_tasks: install-config.yml
+- name: Install configs
+  block:
+    - name: Create config directory
+      file:
+        path: '{{ rclone_config_location | dirname }}'
+        state: directory
+        mode: '0700'
 
-- name: Create directory for ansible custom facts
-  ansible.builtin.file:
-    state: directory
-    recurse: true
-    path: /etc/ansible/facts.d
-
-- name: Create facts file from template
-  ansible.builtin.template:
-    src: 'etc/ansible/facts.d/rclone.fact.j2'
-    dest: /etc/ansible/facts.d/rclone.fact
-    mode: '0755'
-  register: rclone__register_facts
+    - name: Set up rclone config
+      template:
+        src: rclone.conf.j2
+        dest: '{{ rclone_config_location }}'
+        mode: 0600
+  become: true
+  when: rclone_configs is defined
 
 - name: Update Ansible facts if they were modified
   action: setup