From aa6da6c59e3d2bc358cc4b44c2c2193afa7db823 Mon Sep 17 00:00:00 2001
From: Rene Mewissen <rene@tantooine.myfirewall.org>
Date: Thu, 22 Jan 2026 12:32:35 +0100
Subject: [PATCH] fixed installation of JItsimeet

---
 roles/jitsimeet/tasks/prepare_system.yml | 42 +++++++++++++++---------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/roles/jitsimeet/tasks/prepare_system.yml b/roles/jitsimeet/tasks/prepare_system.yml
index 802e0eb..3dde8a4 100644
--- a/roles/jitsimeet/tasks/prepare_system.yml
+++ b/roles/jitsimeet/tasks/prepare_system.yml
@@ -12,25 +12,37 @@
       daemon_reload: true
     when: preinstalled == false or preinstalled is not defined
 
-  - name: jitsimeet | import GPG keys
+  - name: jitsimeet | download GPG keys
     get_url:
-      url: "{{ item }}" # required. HTTP, HTTPS, or FTP URL in the form (http|https|ftp)://[user[:pass]]@host.domain[:port]/path
-      dest: "/etc/apt/keyrings/{{ item | urlsplit('path') | basename | splitext | first}}.asc"  # required. Absolute path of where to download the file to. If C(dest) is a directory, either the server provided filename or, if none provided, the base name of the URL on the remote server will be used. If a directory, C(force) has no effect. If C(dest) is a directory, the file will always be downloaded (regardless of the C(force) option), but replaced only if the contents changed..
+      url: "{{ item.url }}"
+      dest: "/tmp/{{ item.name }}.key"
     loop:
-      - "https://prosody.im/files/prosody-debian-packages.key"
-      - "https://download.jitsi.org/jitsi-key.gpg.key"
-    
-    apt_key:
-      url: "https://download.jitsi.org/jitsi-key.gpg.key"
-      state: present # not required. choices: absent;present. Ensures that the key is present (added) or absent (revoked).
+      - { name: "prosody", url: "https://prosody.im/files/prosody-debian-packages.key" }
+      - { name: "jitsi", url: "https://download.jitsi.org/jitsi-key.gpg.key" }
     when: preinstalled == false or preinstalled is not defined
 
-  - name: jitsimeet | add repository
-    lineinfile:
-      path: "/etc/apt/sources.list.d/jitsi-stable.list"
-      line: "deb https://download.jitsi.org stable/"
-      create: True
-      backup: True
+  - name: jitsimeet | dearmor GPG keys
+    command:
+      cmd: "gpg --dearmor -o /usr/share/keyrings/{{ item.name }}-archive-keyring.gpg /tmp/{{ item.name }}.key"
+      creates: "/usr/share/keyrings/{{ item.name }}-archive-keyring.gpg"
+    loop:
+      - { name: "prosody", url: "https://prosody.im/files/prosody-debian-packages.key" }
+      - { name: "jitsi", url: "https://download.jitsi.org/jitsi-key.gpg.key" }
+    when: preinstalled == false or preinstalled is not defined
+
+  - name: jitsimeet | add prosody repository
+    apt_repository:
+      repo: "deb [signed-by=/usr/share/keyrings/prosody-archive-keyring.gpg] https://packages.prosody.im/debian {{ ansible_distribution_release }} main"
+      state: present
+      filename: prosody
+    notify: apt_update
+    when: preinstalled == false or preinstalled is not defined
+
+  - name: jitsimeet | add jitsi repository
+    apt_repository:
+      repo: "deb [signed-by=/usr/share/keyrings/jitsi-archive-keyring.gpg] https://download.jitsi.org stable/"
+      state: present
+      filename: jitsi-stable
     notify: apt_update
     when: preinstalled == false or preinstalled is not defined