Merge pull request #67 from systemli/remove_prosody_user_creation

Remove prosody user creation to rely on jitsi's internal one

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install ansible-lint==4.3.7 molecule[docker] molecule-goss yamllint
+        run: pip3 install ansible-lint molecule[docker] molecule-goss yamllint
 
       - name: Run Molecule tests.
         run: molecule test -s docker

tasks/jitsi-meet.yml

@@ -35,6 +35,27 @@
     state: present
     cache_valid_time: 3600
 
+- name: Get jitsi_meet_videobridge_secret from config file
+  command: sed -ne 's/^JICOFO_AUTH_PASSWORD=\(\S\+\)\s*$/\1/p' /etc/jitsi/jicofo/config
+  args:
+    warn: False
+  check_mode: no
+  changed_when: False
+  register: jitsi_meet_jicofo_password_from_file
+
+- name: Get jitsi_meet_jicofo_password from config file
+  command: sed -ne 's/^JVB_SECRET=\(\S\+\)\s*$/\1/p' /etc/jitsi/videobridge/config
+  args:
+    warn: False
+  check_mode: no
+  changed_when: False
+  register: jitsi_meet_videobridge_password_from_file
+
+- name: Set fact for jitsi_meet_videobridge_secret
+  set_fact:
+    jitsi_meet_videobridge_secret: "{{ jitsi_meet_videobridge_password_from_file.stdout }}"
+    jitsi_meet_jicofo_password: "{{ jitsi_meet_jicofo_password_from_file.stdout }}"
+
 - name: Copy sip-communicator.properties
   template:
     src: videobridge/sip-communicator.properties.j2
@@ -96,4 +117,5 @@
     name: jicofo
     enabled: yes
 
-- meta: flush_handlers
+- name: Flush handlers
+  meta: flush_handlers

tasks/main.yml

@@ -2,11 +2,7 @@
 
 - name: Derive individual secrets from base secret
   set_fact:
-    "{{ item }}": "{{ (item + jitsi_meet_base_secret | string) | hash('sha1') }}"
-  loop:
-    - jitsi_meet_videobridge_secret
-    - jitsi_meet_jicofo_password
-    - jitsi_meet_turn_secret
+    jitsi_meet_turn_secret: "{{ ('jitsi_meet_turn_secret' + jitsi_meet_base_secret | string) | hash('sha1') }}"
   when: jitsi_meet_base_secret is defined
 
 - name: Derive videobridge nickname

tasks/prosody.yml

@@ -75,26 +75,8 @@
     state: link
   notify:
     - update ca-certificates
-
-- meta: flush_handlers
-
-- name: Delete focus prosody account
-  command: prosodyctl deluser focus@auth.{{ jitsi_meet_server_name }}
-  failed_when: false
-  changed_when: false
-
-- name: Register jicofo agent with Prosody service.
-  command: prosodyctl register focus auth.{{ jitsi_meet_server_name }} {{ jitsi_meet_jicofo_password }}  # noqa: 301
-  changed_when: false
-
-- name: Delete focus prosody account
-  command: prosodyctl deluser jvb@auth.{{ jitsi_meet_server_name }}
-  failed_when: false
-  changed_when: false
-
-- name: Register jvb agent with Prosody service.
-  command: prosodyctl register jvb auth.{{ jitsi_meet_server_name }} {{ jitsi_meet_videobridge_secret }}  # noqa: 301
-  changed_when: false
+- name: Flush handlers
+  meta: flush_handlers
 
 - name: Enable prosody
   service: