IM/ansible_fencl
3
0
Fork 0
forked from jakub/ansible
Code Pull Requests Activity

.

Browse Source
This commit is contained in:
fencl
2025-10-05 14:12:44 +02:00
parent 8d9d39590e
commit 615ebcfe65
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nextcloud/update_collabora.yml
View File

@@ -8,22 +8,29 @@
become_method: sudo become_method: sudo
vars: vars:
# --- Connection to VM (provided by Semaphore env vars) ---
vm_ip: "{{ lookup('env', 'VM_IP') }}" vm_ip: "{{ lookup('env', 'VM_IP') }}"
vm_user: "{{ lookup('env', 'VM_USER') }}" vm_user: "{{ lookup('env', 'VM_USER') }}"
vm_pass: "{{ lookup('env', 'VM_PASS') }}" vm_pass: "{{ lookup('env', 'VM_PASS') }}"
use_sudo: false use_sudo: false
# --- Collabora specifics ---
collabora_debug_caps: true collabora_debug_caps: true
collabora_caps_url: "https://collabora.martinfencl.eu/hosting/capabilities" 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" 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: collabora_commands:
- "{{ docker_prefix }} pull -q collabora/code:latest >/dev/null" - "{{ 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 }} pull {{ collabora_service }} >/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 }} up -d --no-deps --force-recreate {{ collabora_service }} >/dev/null"
tasks: tasks:
- name: Ensure sshpass is installed (for password-based SSH) # English comments - name: Ensure sshpass is installed (for password-based SSH) # English comments
@@ -69,6 +76,10 @@
success_msg: "All Collabora update commands succeeded." success_msg: "All Collabora update commands succeeded."
loop: "{{ collab_cmds.results }}" loop: "{{ collab_cmds.results }}"
# -------------------------
# Readiness checks (controller first, then VM fallback)
# -------------------------
- name: Collabora | Wait for capabilities (controller first) - name: Collabora | Wait for capabilities (controller first)
ansible.builtin.uri: ansible.builtin.uri:
url: "{{ collabora_caps_url }}" url: "{{ collabora_caps_url }}"
@@ -141,7 +152,7 @@
msg: "Capabilities endpoint není dostupný ani po pokusech." msg: "Capabilities endpoint není dostupný ani po pokusech."
when: collab_caps_json is not defined when: collab_caps_json is not defined
# Volitelný detailní výpis (jen když chceš) # Optional full JSON (debug)
- name: Collabora | Full JSON (debug) - name: Collabora | Full JSON (debug)
ansible.builtin.debug: ansible.builtin.debug:
var: collab_caps_json var: collab_caps_json

2
nextcloud/update_uptime_kuma.yml
View File

@@ -29,7 +29,7 @@
kuma_container_name: "uptime-kuma-dev" kuma_container_name: "uptime-kuma-dev"
# Retry policy (to mirror Collabora play): 10x with 2s delay # Retry policy (to mirror Collabora play): 10x with 2s delay
kuma_retries: 10 kuma_retries: 25
kuma_delay: 2 kuma_delay: 2
# Docker command prefix (consistent behavior) # Docker command prefix (consistent behavior)