Merge pull request #85 from alangecker/develop

Release v2.2.31-2

docker-compose.yml

@@ -41,6 +41,7 @@ services:
       SIP_IP_ALLOWLIST: ${SIP_IP_ALLOWLIST:-}
       DISABLE_SOUND_MUTED: ${DISABLE_SOUND_MUTED:-false}
       DISABLE_SOUND_ALONE: ${DISABLE_SOUND_ALONE:-false}
+      SOUNDS_LANGUAGE: ${SOUNDS_LANGUAGE:-en-us-callie}
     volumes:
       - ./conf/sip_profiles:/etc/freeswitch/sip_profiles/external
       - ./conf/dialplan_public:/etc/freeswitch/dialplan/public_docker

mod/etherpad/Dockerfile

@@ -1,4 +1,4 @@
-FROM etherpad/etherpad:1.8.6
+FROM etherpad/etherpad:1.8.7
 
 USER root
 

mod/etherpad/bbb-etherpad-plugin

@@ -1 +1 @@
-Subproject commit 6c28508afde7c10aeec64403c43bf909cae60c74
+Subproject commit 8f1ab5687904c765afc21944c11356057ab22521

mod/etherpad/bbb-etherpad-skin

@@ -1 +1 @@
-Subproject commit 05ad435b3e935c2563b69bc5b937d1f3fd50fe5a
+Subproject commit eee0062af8849d4ef031cadc688aa70afa7a11b1

mod/freeswitch/Dockerfile

@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 # add freeswitch repo
 RUN apt-get update && \
-apt-get install -y --no-install-recommends subversion curl wget ca-certificates gnupg gnupg2 lsb-release && \
+apt-get install -y --no-install-recommends subversion curl wget ca-certificates gnupg gnupg2 lsb-release unzip && \
 curl -k https://files.freeswitch.org/repo/deb/debian-release/fsstretch-archive-keyring.asc | apt-key add - && \
 echo 'deb http://files.freeswitch.org/repo/deb/debian-release/ buster main' > /etc/apt/sources.list.d/freeswitch.list
 

mod/freeswitch/conf/vars.xml.tmpl

@@ -49,7 +49,7 @@
   -->
 
 
-  <X-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/callie"/>
+  <X-PRE-PROCESS cmd="set" data="sound_prefix={{ .Env.SOUNDS_PATH }}"/>
 
   <!--
       This setting is what sets the default domain FreeSWITCH will use if all else fails.

mod/freeswitch/entrypoint.sh

@@ -18,6 +18,34 @@ done
 chown -R freeswitch:daemon /var/freeswitch/meetings
 chmod 777 /var/freeswitch/meetings
 
+
+# install freeswitch sounds if missing
+SOUNDS_DIR=/usr/share/freeswitch/sounds
+if [ "$SOUNDS_LANGUAGE" == "de-de-daedalus3" ]; then
+    if [ ! -d "$SOUNDS_DIR/de/de/daedalus3" ]; then
+        echo "sounds package for de-de-daedalus3 not installed yet"
+        wget -O /tmp/freeswitch-german-soundfiles.zip https://github.com/Daedalus3/freeswitch-german-soundfiles/archive/master.zip
+        mkdir -p $SOUNDS_DIR/de/de/daedalus3
+        unzip /tmp/freeswitch-german-soundfiles.zip -d /tmp/
+        mv /tmp/freeswitch-german-soundfiles-master $SOUNDS_DIR/de/de/daedalus3/conference
+
+        # symlink other folders
+        for folder in "digits" "ivr" "misc"; do
+            ln -s $SOUNDS_DIR/en/us/callie/$folder $SOUNDS_DIR/de/de/daedalus3/$folder
+        done
+
+    fi
+else
+    SOUNDS_PACKAGE=freeswitch-sounds-${SOUNDS_LANGUAGE}
+    if ! dpkg -s $SOUNDS_PACKAGE >/dev/null 2>&1; then
+        echo "sounds package for $SOUNDS_LANGUAGE not installed yet"
+        apt-get install $SOUNDS_PACKAGE
+    fi
+fi
+
+
+export SOUNDS_PATH=$SOUNDS_DIR/$(echo "$SOUNDS_LANGUAGE" | sed 's|-|/|g')
+
 dockerize \
     -template /etc/freeswitch/vars.xml.tmpl:/etc/freeswitch/vars.xml \
     -template /etc/freeswitch/autoload_configs/conference.conf.xml.tmpl:/etc/freeswitch/autoload_configs/conference.conf.xml \

sample.env

@@ -90,6 +90,23 @@ WELCOME_FOOTER=This server is running <a href="https://docs.bigbluebutton.org/"
 # adjust the following path
 DEFAULT_PRESENTATION=./mod/nginx/default.pdf
 
+# language of sound announcements
+# options:
+# - en-ca-june - EN Canadian June
+# - en-us-allison - US English Allison
+# - en-us-callie - US English Callie
+# - de-de-daedalus3 - German by Daedalus3 (https://github.com/Daedalus3/freeswitch-german-soundfiles)
+# - es-ar-mario - Spanish/Argentina Mario
+# - fr-ca-june - FR Canadian June
+# - pt-br-karina - Brazilian Portuguese Karina
+# - ru-ru-elena - RU Russian Elena
+# - ru-ru-kirill - RU Russian Kirill
+# - ru-ru-vika - RU Russian Viktoriya
+# - sv-se-jakob - Swedish (Sweden) Jakob
+# - zh-cn-sinmei - Chinese/China Sinmei
+# - zh-hk-sinmei - Chinese/Hong Kong Sinmei
+SOUNDS_LANGUAGE=en-us-callie
+
 # set to false to disable listenOnlyMode
 LISTEN_ONLY_MODE=true