From 22b75c4f0eaa59caf86214bbcc105f8dea65c273 Mon Sep 17 00:00:00 2001
From: Lzebulon <lzebulon@crans.org>
Date: Sun, 30 Jun 2024 16:34:31 +0200
Subject: [PATCH] fix add collabora to apt

---
 roles/collabora/tasks/main.yml | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/roles/collabora/tasks/main.yml b/roles/collabora/tasks/main.yml
index f0c39f81..7f8dcb0d 100644
--- a/roles/collabora/tasks/main.yml
+++ b/roles/collabora/tasks/main.yml
@@ -10,20 +10,17 @@
 
 
 # Add the key
-- name: Configure the apt key
-  apt_key:
-    url: https://www.collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg
-    state: present
-  register: apt_key_result
-  retries: 3
-  until: apt_key_result is succeeded
-
-
-# Add the repository into source list
-- name: Configure collabora repository
-  apt_repository:
-    repo: https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb
-    state: present
+- name: Add collabora to apt
+  block:
+    - name: add gpg key
+      get_url:
+        url: https://www.collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg
+        dest: /etc/apt/keyrings/collabora.gpg
+    # Add the repository into source list
+    - name: Configure collabora repository
+      apt_repository:
+        repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/collabora.gpg] https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb {{ansible_distribution_release}} stable"
+        state: present
 
 - name: Install Collabora
   apt:
@@ -31,6 +28,6 @@
     name:
         - coolwsd
         - code-brand
-    register: apt_result
-    retries: 3
-    until: apt_result is succeeded
+  register: apt_result
+  retries: 3
+  until: apt_result is succeeded