From dd1feffcc245a72217dec11dfc21db779ed5b176 Mon Sep 17 00:00:00 2001
From: ppacheco28 <patrick.pawp@gmail.com>
Date: Wed, 8 Dec 2021 20:14:18 -0300
Subject: [PATCH] Add support for Jitsi internal authentication user creation

---
 roles/matrix-jitsi/defaults/main.yml          | 24 -------------------
 .../tasks/setup_jitsi_prosody.yml             |  8 +++----
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/roles/matrix-jitsi/defaults/main.yml b/roles/matrix-jitsi/defaults/main.yml
index bdc55335..61742126 100644
--- a/roles/matrix-jitsi/defaults/main.yml
+++ b/roles/matrix-jitsi/defaults/main.yml
@@ -232,30 +232,6 @@ matrix_jitsi_jvb_brewery_muc: jvbbrewery
 matrix_jitsi_jvb_rtp_udp_port: 10000
 matrix_jitsi_jvb_rtp_tcp_port: 4443
 
-# JWT Auth
-matrix_jitsi_auth_jwt_id: jitsi
-matrix_jitsi_auth_jwt_secret: ''
-matrix_jitsi_auth_jwt_accepted_issuers: ''
-matrix_jitsi_authjwt_allow_empty: false
-
-# Jigasi SIP Gateway Configuration - Not Fully Implemented
-matrix_jitsi_jigasi_auth_user: ''
-matrix_jitsi_jigasi_auth_password: ''
-#JIGASI_SIP_URI: '' # SIP URI for incoming / outgoing calls test@sip2sip.info
-#JIGASI_SIP_PASSWORD: ''  # Password for the specified SIP account  passw0rd
-#JIGASI_SIP_SERVER SIP: '' # server (use the SIP account domain if in doubt) sip2sip.info
-#JIGASI_SIP_PORT SIP: '5060' # server port 5060
-#JIGASI_SIP_TRANSPORT: 'UDP'  # SIP transport UDP
-#DIALIN_NUMBERS_URL: 'https://jitsi.chs.chat/dial-in.json' # URL to the JSON with all Dial-In numbers. Example: https://meet.example.com/dialin.json
-#CONFCODE_URL: '' # URL to the API for checking/generating Dial-In codes. Example: https://jitsi-api.jitsi.net/conferenceMapper
-#GC_PROJECT_ID:  # project_id from Google Cloud Credentials
-#GC_PRIVATE_KEY_ID:  # private_key_id from Google Cloud Credentials
-#GC_PRIVATE_KEY:  # private_key from Google Cloud Credentials
-#GC_CLIENT_EMAIL:  # client_email from Google Cloud Credentials
-#GC_CLIENT_ID:  # client_id from Google Cloud Credentials
-#GC_CLIENT_CERT_URL:  # client_x509_cert_url from Google Cloud Credentials
-
-
 # Custom configuration to be injected into `custom-sip-communicator.properties`, passed to Jitsi JVB.
 # This configuration gets appended to the final configuration that Jitsi JVB uses.
 #
diff --git a/roles/matrix-jitsi/tasks/setup_jitsi_prosody.yml b/roles/matrix-jitsi/tasks/setup_jitsi_prosody.yml
index 25dee8ec..d9b6fcba 100644
--- a/roles/matrix-jitsi/tasks/setup_jitsi_prosody.yml
+++ b/roles/matrix-jitsi/tasks/setup_jitsi_prosody.yml
@@ -4,7 +4,7 @@
 # Tasks related to setting up jitsi-prosody
 #
 
-- name: Ensure Matrix jitsi-prosody path exists
+- name: Ensure Matrix jitsi-prosody environment exists
   file:
     path: "{{ item.path }}"
     state: directory
@@ -32,7 +32,7 @@
     mode: 0640
   when: matrix_jitsi_enabled|bool
 
-- name: Ensure matrix-jitsi-prosody.service is installed
+- name: Ensure matrix-jitsi-prosody.service file is installed
   template:
     src: "{{ role_path }}/templates/prosody/matrix-jitsi-prosody.service.j2"
     dest: "{{ matrix_systemd_path }}/matrix-jitsi-prosody.service"
@@ -58,7 +58,7 @@
 # Tasks related to getting rid of jitsi-prosody (if it was previously enabled)
 #
 
-- name: Ensure matrix-jitsi-prosody service file exists
+- name: Ensure matrix-jitsi-prosody.service file exists
   stat:
     path: "{{ matrix_systemd_path }}/matrix-jitsi-prosody.service"
   register: matrix_jitsi_prosody_service_stat
@@ -73,7 +73,7 @@
   register: stopping_result
   when: "not matrix_jitsi_enabled|bool and matrix_jitsi_prosody_service_stat.stat.exists"
 
-- name: Ensure matrix-jitsi-prosody service file doesn't exist
+- name: Ensure matrix-jitsi-prosody.service file doesn't exist
   file:
     path: "{{ matrix_systemd_path }}/matrix-jitsi-prosody.service"
     state: absent