From 0803cf3e52c79935c47df2cf24178d9645a1271c Mon Sep 17 00:00:00 2001
From: "martin.fencl" <martin@martinfencl.eu>
Date: Wed, 24 Dec 2025 00:37:29 +0100
Subject: [PATCH] edit

---
 nextcloud/update_nextcloud_v2.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/nextcloud/update_nextcloud_v2.yml b/nextcloud/update_nextcloud_v2.yml
index 5c8551f..8a0d91a 100644
--- a/nextcloud/update_nextcloud_v2.yml
+++ b/nextcloud/update_nextcloud_v2.yml
@@ -1,7 +1,7 @@
 # nextcloud/update_nextcloud.yml
 
 - name: Update Nextcloud on VM via Proxmox
-  hosts: linux_servers
+  hosts: proxmox_nextcloud  # linux_servers
   gather_facts: false
   become: true
   become_user: root
@@ -31,9 +31,8 @@
 
     # Docker command prefix (consistent behavior and quiet hints)
     docker_prefix: "unalias docker 2>/dev/null || true; DOCKER_CLI_HINTS=0; command docker"
-
+    
     # --- Backup phase commands (run on VM) ---
-    # Use docker_prefix everywhere to bypass aliases/functions
     nextcloud_backup_commands:
       - >-
         mkdir -p "{{ backup_dir }}"
@@ -44,10 +43,11 @@
       - >-
         {{ docker_prefix }} cp nextcloud:/tmp/nextcloud_conf.tgz "{{ backup_dir }}/nextcloud_conf.tgz"
       - >-
-        {{ docker_prefix }} exec nextcloud rm -f /tmp/nextcloud_conf.tgz
+        {{ docker_prefix }} exec nextcloud rm /tmp/nextcloud_conf.tgz || true
       - >-
         {{ docker_prefix }} exec nextcloud-db sh -c 'command -v mariadb-dump >/dev/null && mariadb-dump -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" || mysqldump -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE"' > "{{ backup_dir }}/db.sql"
 
+    # --- Upgrade phase commands (run on VM) ---
     nextcloud_upgrade_commands:
       - >-
         {{ docker_prefix }} compose -p {{ nextcloud_project }} -f {{ nextcloud_compose_file }} pull {{ nextcloud_service }}
@@ -56,9 +56,9 @@
       - >-
         {{ docker_prefix }} exec -u www-data nextcloud php occ upgrade
       - >-
-        {{ docker_prefix }} exec -u www-data nextcloud php occ app:update --all
+        {{ docker_prefix }} exec -u www-data nextcloud php occ app:update --all || true
       - >-
-        {{ docker_prefix }} exec -u www-data nextcloud php occ maintenance:repair --include-expensive
+        {{ docker_prefix }} exec -u www-data nextcloud php occ maintenance:repair --include-expensive || true
 
   tasks:
     - name: Ensure sshpass is installed (for password-based SSH)
@@ -197,9 +197,12 @@
           - -o
           - ConnectTimeout=15
           - "{{ vm_user }}@{{ vm_ip }}"
-          - bash
-          - -lc
-          - "{{ ('sudo ' if use_sudo else '') }}{{ docker_prefix }} exec -u www-data nextcloud php occ maintenance:mode --off"
+          - "{{ ('sudo ' if use_sudo else '') }}docker exec -u www-data nextcloud php occ maintenance:mode --off"
+      environment:
+        SSHPASS: "{{ vm_pass }}"
+      register: nc_maint_off
+      changed_when: false
+      no_log: "{{ DEBUG == 0 }}"
 
     # -------------------------
     # Readiness check (status.php)