From 1e44ff34c394f4e2fd221f3ad7cfebd7d4207fa2 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andi@debian.org>
Date: Mon, 1 Nov 2021 09:34:23 +0100
Subject: [PATCH] Move nextcloud upgrade to separate role.

---
 roles/nextcloud-upgrade/tasks/main.yml | 51 +++++++++++++++++++++++
 roles/nextcloud/tasks/main.yml         | 57 --------------------------
 2 files changed, 51 insertions(+), 57 deletions(-)
 create mode 100644 roles/nextcloud-upgrade/tasks/main.yml

diff --git a/roles/nextcloud-upgrade/tasks/main.yml b/roles/nextcloud-upgrade/tasks/main.yml
new file mode 100644
index 0000000..12e3964
--- /dev/null
+++ b/roles/nextcloud-upgrade/tasks/main.yml
@@ -0,0 +1,51 @@
+---
+
+- name: check/run upgrade
+  command: sudo -u www-data php updater.phar --no-interaction
+  args:
+    chdir: "{{ nc_dir }}/updater"
+    warn: False
+  register: cmd_result
+  changed_when: cmd_result.stdout is not search('Nothing to do.')
+    
+- name: update apps
+  command: "sudo -u www-data php ./occ app:update --all"
+  args:
+    chdir: "{{ nc_dir }}"
+    warn: False
+  register: cmd_result
+  changed_when: cmd_result.stdout | length > 0
+
+- name: install extra apps
+  command: "sudo -u www-data php ./occ app:install {{ item }}"
+  args:
+    chdir: "{{ nc_dir }}"
+    warn: False
+  with_items: "{{ nc_apps }}"
+  register: cmd_result
+  changed_when: cmd_result.stdout is not search('already installed')
+  failed_when:  cmd_result.stdout is not search('already installed') and cmd_result.rc != 0
+
+- name: add missing indices
+  command: "sudo -u www-data php ./occ db:add-missing-indices"
+  args:
+    chdir: "{{ nc_dir }}"
+    warn: False
+  register: cmd_result
+  changed_when: cmd_result.stdout is search('table updated successfully')
+
+- name: add missing columns
+  command: "sudo -u www-data php ./occ db:add-missing-columns"
+  args:
+    chdir: "{{ nc_dir }}"
+    warn: False
+  register: cmd_result
+  changed_when: cmd_result.stdout is search('table updated successfully')
+
+- name: convert filecache to bigint
+  command: "sudo -u www-data php ./occ -n db:convert-filecache-bigint"
+  args:
+    chdir: "{{ nc_dir }}"
+    warn: False
+  register: cmd_result
+  changed_when: cmd_result.stdout is not search('tables already up to date')
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 240812f..5506349 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -225,63 +225,6 @@
     - nextcloudcron.timer
   notify: "enable nextcloudcron.timer"
 
-- name: check/run upgrade
-  command: sudo -u www-data php updater.phar --no-interaction
-  args:
-    chdir: "{{ nc_dir }}/updater"
-    warn: False
-  register: cmd_result
-  changed_when: cmd_result.stdout is not search('Nothing to do.')
-  when: allow_download|bool
-
-## app updates and installations:
-- name: update apps
-  command: "sudo -u www-data php ./occ app:update --all"
-  args:
-    chdir: "{{ nc_dir }}"
-    warn: False
-  register: cmd_result
-  changed_when: cmd_result.stdout | length > 0
-  when: allow_download|bool
-
-- name: install extra apps
-  command: "sudo -u www-data php ./occ app:install {{ item }}"
-  args:
-    chdir: "{{ nc_dir }}"
-    warn: False
-  with_items: "{{ nc_apps }}"
-  register: cmd_result
-  changed_when: cmd_result.stdout is not search('already installed')
-  failed_when:  cmd_result.stdout is not search('already installed') and cmd_result.rc != 0
-  when: allow_download|bool or run_in_installer|default(false)|bool
-
-## nextcloud maintenance
-- name: add missing indices
-  command: "sudo -u www-data php ./occ db:add-missing-indices"
-  args:
-    chdir: "{{ nc_dir }}"
-    warn: False
-  register: cmd_result
-  changed_when: cmd_result.stdout is search('table updated successfully')
-
-- name: add missing columns
-  command: "sudo -u www-data php ./occ db:add-missing-columns"
-  args:
-    chdir: "{{ nc_dir }}"
-    warn: False
-  register: cmd_result
-  changed_when: cmd_result.stdout is search('table updated successfully')
-
-- name: convert filecache to bigint
-  command: "sudo -u www-data php ./occ -n db:convert-filecache-bigint"
-  args:
-    chdir: "{{ nc_dir }}"
-    warn: False
-  register: cmd_result
-  changed_when: cmd_result.stdout is not search('tables already up to date')
-
-
-
 - name: add default NIC to public zone
   firewalld:
     interface: "{{ ansible_default_ipv4.interface }}"