diff --git a/lib/files/jitsi/README.md b/lib/files/jitsi/README.md index 1f1a0da..ddbfb4b 100644 --- a/lib/files/jitsi/README.md +++ b/lib/files/jitsi/README.md @@ -1,6 +1,9 @@ -The files here are unmodified copies of the tarballs at -https://github.com/jitsi/docker-jitsi-meet/tags +The original version of the `gen-passwords.sh` script is +part of docker-jitsi-meet: +https://github.com/jitsi/docker-jitsi-meet/blob/master/gen-passwords.sh -The only purpose is extracting `gen-passwords.sh`, so -it is ok for the file to be out of sync with the -container being used as long as that file remains unchanged. +The version here is taken from tag `stable-9779`, last +modification in commit ID `084266cec54854373d039d20eff13318b2903580`. + +Local modifications: +* none; importing the original version unchanged so we can track all of our changes in git. diff --git a/lib/files/jitsi/gen-passwords.sh b/lib/files/jitsi/gen-passwords.sh new file mode 100755 index 0000000..29aec9b --- /dev/null +++ b/lib/files/jitsi/gen-passwords.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +function generatePassword() { + openssl rand -hex 16 +} + +JICOFO_AUTH_PASSWORD=$(generatePassword) +JVB_AUTH_PASSWORD=$(generatePassword) +JIGASI_XMPP_PASSWORD=$(generatePassword) +JIBRI_RECORDER_PASSWORD=$(generatePassword) +JIBRI_XMPP_PASSWORD=$(generatePassword) + +sed -i.bak \ + -e "s#JICOFO_AUTH_PASSWORD=.*#JICOFO_AUTH_PASSWORD=${JICOFO_AUTH_PASSWORD}#g" \ + -e "s#JVB_AUTH_PASSWORD=.*#JVB_AUTH_PASSWORD=${JVB_AUTH_PASSWORD}#g" \ + -e "s#JIGASI_XMPP_PASSWORD=.*#JIGASI_XMPP_PASSWORD=${JIGASI_XMPP_PASSWORD}#g" \ + -e "s#JIBRI_RECORDER_PASSWORD=.*#JIBRI_RECORDER_PASSWORD=${JIBRI_RECORDER_PASSWORD}#g" \ + -e "s#JIBRI_XMPP_PASSWORD=.*#JIBRI_XMPP_PASSWORD=${JIBRI_XMPP_PASSWORD}#g" \ + "$(dirname "$0")/.env" diff --git a/lib/files/jitsi/stable-7882.tar.gz b/lib/files/jitsi/stable-7882.tar.gz deleted file mode 100644 index f83325a..0000000 Binary files a/lib/files/jitsi/stable-7882.tar.gz and /dev/null differ diff --git a/lib/jitsi.sh b/lib/jitsi.sh index 0c42294..7cc9b64 100644 --- a/lib/jitsi.sh +++ b/lib/jitsi.sh @@ -18,8 +18,7 @@ config_jitsi() { fi # Extract Jitsi's gen-password.sh into /federated/apps/jitsi -tar zxvf /federated/lib/files/jitsi/stable-* --strip-components 1 --wildcards -C /federated/apps/jitsi '*/gen-passwords.sh' &> /dev/null -[ $? -ne 0 ] && fail "Couldn't extract files/jitsi/stable* into /federated/apps/jitsi" +install -c -m 755 /federated/lib/files/jitsi/gen-passwords.sh /federated/apps/jitsi/ # Create docker compose file cat > /federated/apps/jitsi/docker-compose.yml <