From 615ebcfe6582fd98edad76067b7cf63a8f72edc3 Mon Sep 17 00:00:00 2001
From: fencl <martin@martinfencl.eu>
Date: Sun, 5 Oct 2025 14:12:44 +0200
Subject: [PATCH] .

---
 nextcloud/update_collabora.yml   | 25 ++++++++++++++++++-------
 nextcloud/update_uptime_kuma.yml |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/nextcloud/update_collabora.yml b/nextcloud/update_collabora.yml
index 043eae3..73d99dc 100644
--- a/nextcloud/update_collabora.yml
+++ b/nextcloud/update_collabora.yml
@@ -8,22 +8,29 @@
   become_method: sudo
 
   vars:
+    # --- Connection to VM (provided by Semaphore env vars) ---
     vm_ip:   "{{ lookup('env', 'VM_IP') }}"
     vm_user: "{{ lookup('env', 'VM_USER') }}"
     vm_pass: "{{ lookup('env', 'VM_PASS') }}"
     use_sudo: false
+
+    # --- Collabora specifics ---
     collabora_debug_caps: true
-
     collabora_caps_url: "https://collabora.martinfencl.eu/hosting/capabilities"
-    collabora_project: "nextcloud-collabora"
-    collabora_compose_file: "/data/compose/nextcloud/collabora-only.yml"
 
+    # Use the FULL Nextcloud stack compose file; only target the 'collabora' service inside it
+    collabora_project: "nextcloud-collabora"
+    collabora_compose_file: "/data/compose/nextcloud-collabora.yml"
+    collabora_service: "collabora"
+
+    # Docker command prefix (consistent behavior and quiet hints)
     docker_prefix: "unalias docker 2>/dev/null || true; DOCKER_CLI_HINTS=0; command docker"
 
+    # Commands to run on the target VM (quiet outputs)
     collabora_commands:
       - "{{ docker_prefix }} pull -q collabora/code:latest >/dev/null"
-      - "{{ docker_prefix }} compose -p {{ collabora_project }} -f {{ collabora_compose_file }} pull collabora >/dev/null"
-      - "{{ docker_prefix }} compose -p {{ collabora_project }} -f {{ collabora_compose_file }} up -d --no-deps --force-recreate collabora >/dev/null"
+      - "{{ docker_prefix }} compose -p {{ collabora_project }} -f {{ collabora_compose_file }} pull {{ collabora_service }} >/dev/null"
+      - "{{ docker_prefix }} compose -p {{ collabora_project }} -f {{ collabora_compose_file }} up -d --no-deps --force-recreate {{ collabora_service }} >/dev/null"
 
   tasks:
     - name: Ensure sshpass is installed (for password-based SSH)  # English comments
@@ -69,6 +76,10 @@
         success_msg: "All Collabora update commands succeeded."
       loop: "{{ collab_cmds.results }}"
 
+    # -------------------------
+    # Readiness checks (controller first, then VM fallback)
+    # -------------------------
+
     - name: Collabora | Wait for capabilities (controller first)
       ansible.builtin.uri:
         url: "{{ collabora_caps_url }}"
@@ -141,8 +152,8 @@
         msg: "Capabilities endpoint není dostupný ani po pokusech."
       when: collab_caps_json is not defined
 
-    # Volitelný detailní výpis (jen když chceš)
+    # Optional full JSON (debug)
     - name: Collabora | Full JSON (debug)
       ansible.builtin.debug:
         var: collab_caps_json
-      when: collabora_debug_caps and (collab_caps_json is defined)
\ No newline at end of file
+      when: collabora_debug_caps and (collab_caps_json is defined)
diff --git a/nextcloud/update_uptime_kuma.yml b/nextcloud/update_uptime_kuma.yml
index 3183f85..c59b674 100644
--- a/nextcloud/update_uptime_kuma.yml
+++ b/nextcloud/update_uptime_kuma.yml
@@ -29,7 +29,7 @@
     kuma_container_name: "uptime-kuma-dev"
 
     # Retry policy (to mirror Collabora play): 10x with 2s delay
-    kuma_retries: 10
+    kuma_retries: 25
     kuma_delay: 2
 
     # Docker command prefix (consistent behavior)