From 7ee867aaf7167f7da5636e4a931fd774d5655f0e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 25 Aug 2024 22:04:04 +0200
Subject: nextcloud: fix some migration issues

---
 roles/apps/nextcloud/instance/defaults/main.yml            |  9 +++++++++
 roles/apps/nextcloud/instance/tasks/main.yml               |  1 +
 .../instance/templates/pod-spec-with-mariadb.yml.j2        | 14 +++++++++-----
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 roles/apps/nextcloud/instance/defaults/main.yml

diff --git a/roles/apps/nextcloud/instance/defaults/main.yml b/roles/apps/nextcloud/instance/defaults/main.yml
new file mode 100644
index 00000000..1a8a6d52
--- /dev/null
+++ b/roles/apps/nextcloud/instance/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+nextcloud_app_uid: "950"
+nextcloud_app_gid: "950"
+
+nextcloud_db_uid: "951"
+nextcloud_db_gid: "951"
+
+nextcloud_redis_uid: "952"
+nextcloud_redis_gid: "952"
diff --git a/roles/apps/nextcloud/instance/tasks/main.yml b/roles/apps/nextcloud/instance/tasks/main.yml
index 65c4f5e3..373aa0a8 100644
--- a/roles/apps/nextcloud/instance/tasks/main.yml
+++ b/roles/apps/nextcloud/instance/tasks/main.yml
@@ -127,6 +127,7 @@
       **  $ nextcloud-occ {{ nextcloud_instance }} config:system:set redis port --type integer --value 6379
       **  $ nextcloud-occ {{ nextcloud_instance }} config:system:set redis timeout --type float --value 0.0
       **  $ nextcloud-occ {{ nextcloud_instance }} config:system:set redis password
+      **  $ nextcloud-occ {{ nextcloud_instance }} config:system:set maintenance_window_start --type integer --value 23
       **
       **  in case you want to use an exteranl collabora/code server:
       **
diff --git a/roles/apps/nextcloud/instance/templates/pod-spec-with-mariadb.yml.j2 b/roles/apps/nextcloud/instance/templates/pod-spec-with-mariadb.yml.j2
index b6c6137d..42d76757 100644
--- a/roles/apps/nextcloud/instance/templates/pod-spec-with-mariadb.yml.j2
+++ b/roles/apps/nextcloud/instance/templates/pod-spec-with-mariadb.yml.j2
@@ -68,15 +68,19 @@ containers:
   resources:
     limits:
       memory: "2Gi"
-{% if 'new' in nextcloud_instances[nextcloud_instance] and nextcloud_instances[nextcloud_instance].new %}
   env:
-  - name: MYSQL_RANDOM_ROOT_PASSWORD
+  - name: MARIADB_AUTO_UPGRADE
     value: "true"
-  - name: MYSQL_DATABASE
+  - name: MARIADB_DISABLE_UPGRADE_BACKUP
+    value: "true"
+{% if 'new' in nextcloud_instances[nextcloud_instance] and nextcloud_instances[nextcloud_instance].new %}
+  - name: MARIADB_RANDOM_ROOT_PASSWORD
+    value: "true"
+  - name: MARIADB_DATABASE
     value: nextcloud
-  - name: MYSQL_USER
+  - name: MARIADB_USER
     value: nextcloud
-  - name: MYSQL_PASSWORD
+  - name: MARIADB_PASSWORD
     value: "{{ nextcloud_instances[nextcloud_instance].database.password }}"
 {% endif %}
   volumeMounts:
-- 
cgit v1.2.3