From e7128055f7c5efe598552e93f7c250f7f125955d Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 18 Oct 2024 21:00:19 +0300
Subject: [PATCH] Minor improvements to the baibot role

---
 .../matrix-bot-baibot/tasks/install.yml       | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/roles/custom/matrix-bot-baibot/tasks/install.yml b/roles/custom/matrix-bot-baibot/tasks/install.yml
index ce9b8220a..f74ab3442 100644
--- a/roles/custom/matrix-bot-baibot/tasks/install.yml
+++ b/roles/custom/matrix-bot-baibot/tasks/install.yml
@@ -8,9 +8,10 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
+    - {path: "{{ matrix_bot_baibot_base_path }}", when: true}
     - {path: "{{ matrix_bot_baibot_config_path }}", when: true}
     - {path: "{{ matrix_bot_baibot_data_path }}", when: true}
-    - {path: "{{ matrix_bot_baibot_container_src_files_path }}", when: matrix_bot_baibot_container_image_self_build}
+    - {path: "{{ matrix_bot_baibot_container_src_files_path }}", when: "{{ matrix_bot_baibot_container_image_self_build }}"}
   when: "item.when | bool"
 
 - name: Ensure baibot configuration installed
@@ -29,7 +30,7 @@
     group: "{{ matrix_user_groupname }}"
     mode: 0640
 
-- name: Ensure baibot image is pulled
+- name: Ensure baibot container image is pulled
   community.docker.docker_image:
     name: "{{ matrix_bot_baibot_container_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -41,28 +42,28 @@
   delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
-- name: Ensure baibot repository is present on self-build
-  ansible.builtin.git:
-    repo: "{{ matrix_bot_baibot_container_repo }}"
-    version: "{{ matrix_bot_baibot_container_repo_version }}"
-    dest: "{{ matrix_bot_baibot_container_src_files_path }}"
-    force: "yes"
-  become: true
-  become_user: "{{ matrix_user_username }}"
-  register: matrix_bot_baibot_git_pull_results
-  when: "matrix_bot_baibot_container_image_self_build | bool"
+- when: "matrix_bot_baibot_container_image_self_build | bool"
+  block:
+    - name: Ensure baibot repository is present on self-build
+      ansible.builtin.git:
+        repo: "{{ matrix_bot_baibot_container_repo }}"
+        version: "{{ matrix_bot_baibot_container_repo_version }}"
+        dest: "{{ matrix_bot_baibot_container_src_files_path }}"
+        force: "yes"
+      become: true
+      become_user: "{{ matrix_user_username }}"
+      register: matrix_bot_baibot_git_pull_results
 
-- name: Ensure baibot image is built
-  community.docker.docker_image:
-    name: "{{ matrix_bot_baibot_container_image }}"
-    source: build
-    force_source: "{{ matrix_bot_baibot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
-    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_baibot_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_bot_baibot_container_src_files_path }}"
-      pull: true
-  when: "matrix_bot_baibot_container_image_self_build | bool"
+    - name: Ensure baibot container image is built
+      community.docker.docker_image:
+        name: "{{ matrix_bot_baibot_container_image }}"
+        source: build
+        force_source: "{{ matrix_bot_baibot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
+        force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_baibot_git_pull_results.changed }}"
+        build:
+          dockerfile: Dockerfile
+          path: "{{ matrix_bot_baibot_container_src_files_path }}"
+          pull: true
 
 - name: Ensure baibot container network is created
   community.general.docker_network: