From 8fb32c5caaaf2b401b24df91cc9d2ec7363d4286 Mon Sep 17 00:00:00 2001 From: Virkkunen Date: Fri, 25 Apr 2025 20:08:05 +0200 Subject: [PATCH] backup directories and linter fixes --- .../tasks/migrate_from_conduwuit.yml | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/roles/custom/matrix-continuwuity/tasks/migrate_from_conduwuit.yml b/roles/custom/matrix-continuwuity/tasks/migrate_from_conduwuit.yml index 734bf67bc..57159ee1b 100644 --- a/roles/custom/matrix-continuwuity/tasks/migrate_from_conduwuit.yml +++ b/roles/custom/matrix-continuwuity/tasks/migrate_from_conduwuit.yml @@ -10,12 +10,12 @@ # # and restore continuwuity labels. -- name: Check existence of conduwuit directory ({{ matrix_base_data_path }}/conduwuit) +- name: Check existence of conduwuit directory ansible.builtin.stat: path: "{{ matrix_base_data_path }}/conduwuit" register: matrix_conduwuit_directory_stat -- name: Check existence of continuwuity directory ({{ matrix_base_data_path }}/continuwuity) +- name: Check existence of continuwuity directory ansible.builtin.stat: path: "{{ matrix_base_data_path }}/continuwuity" register: matrix_continuwuity_directory_stat @@ -31,24 +31,27 @@ enabled: false daemon_reload: true - - name: Ensure continuwuity folder is removed + - name: Ensure continuwuity directory is backed up ansible.builtin.command: cmd: "mv {{ matrix_base_data_path }}/continuwuity {{ matrix_base_data_path }}/continuwuity_old" creates: "{{ matrix_base_data_path }}/continuwuity_old" + removes: "{{ matrix_base_data_path }}/continuwuity" - - name: Ensure conduwuit directory relocated - ansible.builtin.command: - cmd: "mv {{ matrix_base_data_path }}/conduwuit {{ matrix_base_data_path }}/continuwuity" - creates: "{{ matrix_base_data_path }}/continuwuity" - removes: "{{ matrix_base_data_path }}" + - name: Ensure conduwuit directory contents are copied to continuwuity + ansible.builtin.copy: + src: "{{ matrix_base_data_path }}/conduwuit/" + dest: "{{ matrix_base_data_path }}/continuwuity" + remote_src: true + mode: preserve - name: Ensure conduwuit.toml file is renamed ansible.builtin.command: cmd: "mv {{ matrix_base_data_path }}/continuwuity/config/conduwuit.toml {{ matrix_base_data_path }}/continuwuity/config/continuwuity.toml" + removes: "{{ matrix_base_data_path }}/continuwuity/config/conduwuit.toml" - name: Ensure continuwuity labels are restored ansible.builtin.command: - cmd: "mv {{ matrix_base_data_path }}/continuwuity_old/labels {{ matrix_base_data_path }}/continuwuity/labels" + cmd: "cp {{ matrix_base_data_path }}/continuwuity_old/labels {{ matrix_base_data_path }}/continuwuity/labels" - name: Ensure matrix-continuwuity.service systemd service is started ansible.builtin.systemd: