Remove legacy jibri auth

ansible/roles/jibri-auth/defaults/main.yml

@@ -1,18 +1,4 @@
 ---
-jibri_auth_domain: "auth.{{ environment_domain_name }}"
-jibri_auth_domain_path: "/var/lib/prosody/{{ jibri_auth_domain | regex_replace('\\.', '%2e') | regex_replace('-', '%2d') }}/accounts/{{ jibri_auth_user }}.dat"
-jibri_auth_password: "jibri"
-jibri_auth_prosody_jvb_domain_path: "/var/lib/prosody-jvb/{{ jibri_prosody_jvb_auth_domain_name | regex_replace('\\.', '%2e') |
-  regex_replace('-', '%2d') }}/accounts/{{ jibri_auth_user }}.dat"
-jibri_auth_user: "jibri"
-jibri_prosody_jvb_auth_domain_name: "auth.jvb.{{ environment_domain_name }}"
-jibri_selenium_auth_domain: "recorder.{{ environment_domain_name }}"
-jibri_selenium_auth_domain_path: "/var/lib/prosody/{{ jibri_selenium_auth_domain | regex_replace('\\.', '%2e') |
-  regex_replace('-', '%2d') }}/accounts/{{ jibri_selenium_auth_user }}.dat"
-jibri_selenium_auth_password: "replaceme"
-jibri_selenium_auth_user: "recorder"
-jibri_legacy_auth: true
-# Different than the legacy username because we want to provision new accounts.
 # Note: avoid capital letters and special chars because prosody lowers/encodes them in the filename.
 jibri_brewery_domain: "auth.{{ environment_domain_name }}"
 jibri_brewery_username_A: jibria

ansible/roles/jibri-auth/tasks/main.yml

@@ -1,16 +1,4 @@
 ---
-- name: Add jibri authentication
-  ansible.builtin.command: prosodyctl register {{ jibri_auth_user }} {{ jibri_auth_domain }} {{ jibri_auth_password }}
-  args:
-    creates: "{{ jibri_auth_domain_path }}"
-  when: jibri_legacy_auth and jibri_auth_password and jibri_auth_password != 'replaceme'
-
-- name: Add jibri selenium authentication
-  ansible.builtin.command: prosodyctl register {{ jibri_selenium_auth_user }} {{ jibri_selenium_auth_domain }} {{ jibri_selenium_auth_password }}
-  args:
-    creates: "{{ jibri_selenium_auth_domain_path }}"
-  when: jibri_legacy_auth and jibri_selenium_auth_password and jibri_selenium_auth_password != 'replaceme'
-
 - name: Add jibri account A for XMPP brewery
   ansible.builtin.command: prosodyctl adduser "{{ jibri_brewery_username_A }}@{{ jibri_brewery_domain }}"
   args:

ansible/roles/jibri-java/defaults/main.yml

@@ -7,12 +7,12 @@ jibri_asap_audience: "jibri-queue"
 jibri_asap_issuer: "jibri"
 jibri_asap_key_id: "{{ asap_key['id'] if asap_key['id'] is defined else 'default' }}"
 jibri_asap_key_path: "/etc/jitsi/jibri/asap.key"
-# Either "A", "B", or "legacy". Just used to select the correct username/password used for login.
-jibri_auth_type: "legacy"
-jibri_auth_call_user: "{{ 'jibria' if jibri_auth_type == 'A' else ('jibrib' if jibri_auth_type == 'B' else 'recorder') }}"
-jibri_auth_call_pass: "{{ secrets_jibri_selenium_A if jibri_auth_type == 'A' else (secrets_jibri_selenium_B if jibri_auth_type == 'B' else jibri_selenium_auth_password) }}"
-jibri_auth_control_user: "{{ 'jibria' if jibri_auth_type == 'A' else ('jibrib' if jibri_auth_type == 'B' else 'jibri') }}"
-jibri_auth_control_pass: "{{ secrets_jibri_brewery_A if jibri_auth_type == 'A' else (secrets_jibri_brewery_B if jibri_auth_type == 'B' else jibri_auth_password) }}"
+# Either "A", "B". Just used to select the correct username/password used for login.
+jibri_auth_type: "B"
+jibri_auth_call_user: "{{ 'jibria' if jibri_auth_type == 'A' 'jibrib' }}"
+jibri_auth_call_pass: "{{ secrets_jibri_selenium_A if jibri_auth_type == 'A' else secrets_jibri_selenium_B }}"
+jibri_auth_control_user: "{{ 'jibria' if jibri_auth_type == 'A' else 'jibrib' }}"
+jibri_auth_control_pass: "{{ secrets_jibri_brewery_A if jibri_auth_type == 'A' else secrets_jibri_brewery_B }}"
 jibri_brewery_prefix: "{{ internal_muc_prefix | default('internal.auth') }}."
 jibri_brewery_prosody_jvb_prefix: "{{ internal_jvb_prosody_muc_prefix | default('muc.jvb') }}."
 # Whether or not any value in the call-status-checks block is overridden
@@ -74,7 +74,6 @@ jibri_status_cron:
   job: "{{ jibri_path_to_status_script }} > /tmp/status-cron-output 2>&1"
   minute: "*"
 jibri_username: jibri
-jibri_xmpp_password: "{{ jibri_auth_password }}"
 jibri_xmpp_port: 5222
 jibri_xmpp_room_name: "{{ jibri_xmpp_room_name_default if not jibri_pjsua_flag else jibri_xmpp_room_name_sip }}"
 jibri_xmpp_room_name_default: "JibriBrewery"