Merge "Use real passwords for meetpad"

.zuul.yaml

@@ -1356,6 +1356,7 @@
       - playbooks/roles/jitsi-meet/
       - playbooks/roles/pip3/
       - playbooks/roles/install-docker/
+      - playbooks/zuul/templates/group_vars/meetpad.yaml.j2
       - testinfra/test_meetpad.py
 
 - job:

playbooks/roles/jitsi-meet/tasks/main.yaml

@@ -2,6 +2,10 @@
   synchronize:
     src: jitsi-meet-docker/
     dest: /etc/jitsi-meet-docker/
+- name: Write env file
+  template:
+    src: env.j2
+    dest: /etc/jitsi-meet-docker/.env
 - name: Ensure jitsi-meet volume directories exist
   file:
     state: directory

playbooks/roles/jitsi-meet/templates/env.j2

@@ -172,7 +172,7 @@ JVB_BREWERY_MUC=jvbbrewery
 JVB_AUTH_USER=jvb
 
 # XMPP password for JVB client connections.
-JVB_AUTH_PASSWORD=passw0rd
+JVB_AUTH_PASSWORD={{ meetpad_jvb_auth_password }}
 
 # STUN servers used to discover the server's public IP.
 JVB_STUN_SERVERS=stun.l.google.com:19302,stun1.l.google.com:19302,stun2.l.google.com:19302
@@ -189,13 +189,13 @@ JVB_TCP_PORT=4443
 #JVB_ENABLE_APIS=rest,colibri
 
 # XMPP component password for Jicofo.
-JICOFO_COMPONENT_SECRET=s3cr37
+JICOFO_COMPONENT_SECRET={{ meetpad_jicofo_component_secret }}
 
 # XMPP user for Jicofo client connections. NOTE: this option doesn't currently work due to a bug.
 JICOFO_AUTH_USER=focus
 
 # XMPP password for Jicofo client connections.
-JICOFO_AUTH_PASSWORD=passw0rd
+JICOFO_AUTH_PASSWORD={{ meetpad_jicofo_auth_password }}
 
 # Base URL of Jicofo's reservation REST API
 #JICOFO_RESERVATION_REST_BASE_URL=http://reservation.example.com
@@ -204,7 +204,7 @@ JICOFO_AUTH_PASSWORD=passw0rd
 JIGASI_XMPP_USER=jigasi
 
 # XMPP password for Jigasi MUC client connections.
-JIGASI_XMPP_PASSWORD=passw0rd
+JIGASI_XMPP_PASSWORD={{ meetpad_jigasi_xmpp_password }}
 
 # MUC name for the Jigasi pool.
 JIGASI_BREWERY_MUC=jigasibrewery
@@ -255,7 +255,7 @@ XMPP_RECORDER_DOMAIN=recorder.localhost
 JIBRI_RECORDER_USER=recorder
 
 # XMPP recorder password for Jibri client connections.
-JIBRI_RECORDER_PASSWORD=passw0rd
+JIBRI_RECORDER_PASSWORD={{ meetpad_jibri_recorder_password }}
 
 # Directory for recordings inside Jibri container.
 JIBRI_RECORDING_DIR=/config/recordings
@@ -267,7 +267,7 @@ JIBRI_FINALIZE_RECORDING_SCRIPT_PATH=/config/finalize.sh
 JIBRI_XMPP_USER=jibri
 
 # XMPP password for Jibri client connections.
-JIBRI_XMPP_PASSWORD=passw0rd
+JIBRI_XMPP_PASSWORD={{ meetpad_jibri_xmpp_password }}
 
 # MUC name for the Jibri pool.
 JIBRI_BREWERY_MUC=jibribrewery

playbooks/zuul/run-base.yaml

@@ -51,6 +51,7 @@
         - group_vars/gitea.yaml
         - group_vars/gitea-lb.yaml
         - group_vars/letsencrypt.yaml
+        - group_vars/meetpad.yaml
         - group_vars/registry.yaml
         - group_vars/review.yaml
         - group_vars/review-dev.yaml

playbooks/zuul/templates/group_vars/meetpad.yaml.j2

@@ -0,0 +1,6 @@
+meetpad_jvb_auth_password: 8c64807830bcc7581821d3157899e3b0
+meetpad_jicofo_component_secret: 3bcd6b4494d99de7ff7b64b931d394f6
+meetpad_jicofo_auth_password: e0d9bceec264b78d8bf0022787f92498
+meetpad_jigasi_xmpp_password: 2a8fb7ff7c59f09d94960f3fa15001fb
+meetpad_jibri_recorder_password: 2a3e28706a631e5973247dd570b6f33a
+meetpad_jibri_xmpp_password: 7c757c0b2ce5549b90ad740150d48ed8