From: rominique <romain.legoff@heureux-cyclage.org>
Date: Mon, 25 Sep 2023 18:48:53 +0000 (+0200)
Subject: fix move and restore takss
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=5ed75e32b36057a8406afda6d8f193bcb1d9f669;p=lhc%2Fansible.git

fix move and restore takss
---

diff --git a/README.md b/README.md
index d84fba8..c8b07fc 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ x hostvar/groupvar
 - tâches pour supprimer les fichiers tempo sur ateliers et la vm ?
 - téléchargers les apps correspondants à la version nouvelle de nextcloud
 - utiliser le code de gresille?
+- besoin de faire un rôle ansible pour plus de clarté?
 
 ## Requirements
 
diff --git a/tasks/backup_from_ateliers.yml b/tasks/backup_from_ateliers.yml
index 11cd3ff..af1e3ab 100644
--- a/tasks/backup_from_ateliers.yml
+++ b/tasks/backup_from_ateliers.yml
@@ -47,7 +47,7 @@
     flat: yes
   loop:
     - "{{ nextcloud_tmp_path }}/dump.sql"
-    - "{{ nextcloud_tmp_path }}/data.tgz"
+    - "{{ nextcloud_tmp_path }}/data.tar.gz"
     - "{{ nextcloud_webroot }}/config/config.php"
 
 # - name: deactivate nextcloud maintenance mode
diff --git a/tasks/restore_to_vm.yml b/tasks/restore_to_vm.yml
index f2812e8..ca771cb 100644
--- a/tasks/restore_to_vm.yml
+++ b/tasks/restore_to_vm.yml
@@ -15,7 +15,7 @@
     dest: "{{ nextcloud_data_path }}"
   loop:
     - "{{ nextcloud_tmp_path }}/dump.sql"
-    - "{{ nextcloud_tmp_path }}/data.tgz"
+    - "{{ nextcloud_tmp_path }}/data.tar.gz"
     - "{{ nextcloud_tmp_path }}/config.php"
 
 - name: Extract nc data archive
@@ -47,14 +47,24 @@
     mode: '640' #or u=rwx,g=r,o=
 
 - name: update nextcloud root dir symbolic link
-  become_user: "{{ nextcloud_websrv_user }}"
   become: true
   ansible.builtin.file:
-    src: "{{ nextcloud_files_path }}/nextcloud-{{ nextcloud_version }}"
+    src: "{{ nextcloud_source }}"
     dest: "{{ nextcloud_webroot }}/nextcloud"
-    owner: "{{ nextcloud_websrv_user }}"
-    group: "{{ nextcloud_websrv_user }}"
+    owner: nextcloud
+    group: nextcloud
+    state: link
+    follow: false
+
+- name: update nextcloud common app dir symbolic link
+  become: true
+  ansible.builtin.file:
+    src: "{{ nextcloud_common }}"
+    dest: "{{ nextcloud_webroot }}/common"
+    owner: nextcloud
+    group: nextcloud
     state: link
+    follow: false
 
 - name: deactivate nextcloud maintenance mode
   become_user: "{{ nextcloud_websrv_user }}"
@@ -63,6 +73,12 @@
   args:
     chdir: "{{ nextcloud_webroot }}"
 
+- name: start webserver service
+  become: true
+  ansible.builtin.service:
+    name: "{{ nextcloud_websrv }}"
+    state: started
+
 - name: Run occ upgrade
   become_user: "{{ nextcloud_websrv_user }}"
   become: true
@@ -122,12 +138,4 @@
     loop: "{{ nc_indices_cmd.results }}" 
     loop_control:
       label: "{{ item.command }}"
-  when: "'Nextcloud is already latest version' not in nc_upgrade_result.stdout_lines"
-
-- name: start webserver service
-  become: true
-  become_user: root
-  ansible.builtin.service:
-    name: "{{ nextcloud_websrv }}"
-    state: started
-  no_log: true
\ No newline at end of file
+  when: "'Nextcloud is already latest version' not in nc_upgrade_result.stdout_lines"
\ No newline at end of file