extern/docker
1
0
Fork 1
mirror of https://github.com/bigbluebutton/docker.git synced 2025-02-23 21:21:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

v2.3-rc-1

Browse Source
This commit is contained in:
chandi 2021-04-28 16:07:22 +02:00
parent f28846ca5d
commit 0429c0565f
17 changed files with 55 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
# 📦 BigBlueButton 2.3 Docker # 📦 BigBlueButton 2.3 Docker
Version: 2.3-beta-5 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) Version: 2.3-rc-1 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
## Note ## Note
Even though it seems to be stable so far, it is still a beta, which means that you can expect broken bits and pieces in some places. Even though it seems to be stable so far, it is still a beta, which means that you can expect broken bits and pieces in some places.

2
docker-compose.tmpl.yml
View File

@ -237,7 +237,7 @@ services:
ipv4_address: 10.7.7.15 ipv4_address: 10.7.7.15
jodconverter: jodconverter:
image: eugenmayer/jodconverter:rest build: mod/jodconverter
restart: unless-stopped restart: unless-stopped
deploy: deploy:
resources: resources:

4
mod/apps-akka/Dockerfile
View File

@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
RUN apt-get update && apt-get install -y subversion RUN apt-get update && apt-get install -y subversion
# download bbb-common-message # download bbb-common-message
ENV TAG_COMMON_MESSAGE v2.3-beta-4 ENV TAG_COMMON_MESSAGE v2.3-rc-1
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -14,7 +14,7 @@ RUN cd /bbb-common-message \
# =================================================== # ===================================================
ENV TAG v2.3-beta-4 ENV TAG v2.3-rc-1
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \
&& rm -rf /source/.svn && rm -rf /source/.svn

6
mod/bbb-web/Dockerfile
View File

@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
RUN apt-get update && apt-get install -y subversion RUN apt-get update && apt-get install -y subversion
# download bbb-common-message # download bbb-common-message
ENV TAG_COMMON_MESSAGE v2.3-beta-4 ENV TAG_COMMON_MESSAGE v2.3-rc-1
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -26,7 +26,7 @@ RUN cd /opt \
ENV PATH="/opt/gradle-6.7/bin:${PATH}" ENV PATH="/opt/gradle-6.7/bin:${PATH}"
# download bbb-common-web # download bbb-common-web
ENV TAG_COMMON_WEB v2.3-beta-4 ENV TAG_COMMON_WEB v2.3-rc-1
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -35,7 +35,7 @@ RUN cd /bbb-common-web \
&& ./deploy.sh && ./deploy.sh
# download bbb-web # download bbb-web
ENV TAG_WEB v2.3-beta-4 ENV TAG_WEB v2.3-rc-1
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \
&& rm -rf /bbb-web/.svn && rm -rf /bbb-web/.svn

18
mod/bbb-web/office-convert.sh
View File

@ -1,14 +1,30 @@
#!/bin/bash #!/bin/bash
set -e
set -u
PATH="/bin/:/usr/bin/"
# This script receives three params # This script receives three params
# Param 1: Input office file path (e.g. "/tmp/test.odt") # Param 1: Input office file path (e.g. "/tmp/test.odt")
# Param 2: Output pdf file path (e.g. "/tmp/test.pdf") # Param 2: Output pdf file path (e.g. "/tmp/test.pdf")
# Param 3: Destination Format (pdf default) # Param 3: Destination Format (pdf default)
if (( $# == 0 )); then
echo "Missing parameter 1 (Input office file path)";
exit 1
elif (( $# == 1 )); then
echo "Missing parameter 2 (Output pdf file path)";
exit 1
fi;
source=${1}
dest=${2}
#If output format is missing, define PDF #If output format is missing, define PDF
convertTo="${3:-pdf}" convertTo="${3:-pdf}"
curl -v -X POST "http://jodconverter:8080/lool/convert-to/$convertTo" \ curl -v -X POST "http://jodconverter:8080/lool/convert-to/$convertTo" \
-H "accept: application/octet-stream" \ -H "accept: application/octet-stream" \
-H "Content-Type: multipart/form-data" \ -H "Content-Type: multipart/form-data" \
-F "data=@$1" > $2 -F "data=@${source}" > ${dest}
exit 0 exit 0

44
mod/freeswitch/Dockerfile
View File

@ -15,68 +15,28 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
# install freeswitch # install freeswitch
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
freeswitch \ freeswitch \
freeswitch-mod-amr \
freeswitch-mod-b64 \
freeswitch-mod-commands \ freeswitch-mod-commands \
freeswitch-mod-conference \ freeswitch-mod-conference \
freeswitch-mod-console \ freeswitch-mod-console \
freeswitch-mod-db \
freeswitch-mod-dialplan-asterisk \
freeswitch-mod-dialplan-xml \ freeswitch-mod-dialplan-xml \
freeswitch-mod-dptools \ freeswitch-mod-dptools \
freeswitch-mod-enum \
freeswitch-mod-esf \
freeswitch-mod-event-socket \ freeswitch-mod-event-socket \
freeswitch-mod-expr \
freeswitch-mod-fifo \
freeswitch-mod-fsv \
freeswitch-mod-g723-1 \
freeswitch-mod-g729 \
freeswitch-mod-hash \
freeswitch-mod-httapi \
freeswitch-mod-local-stream \
freeswitch-mod-loopback \
freeswitch-mod-lua \
freeswitch-mod-native-file \ freeswitch-mod-native-file \
freeswitch-mod-opusfile \ freeswitch-mod-opusfile \
freeswitch-mod-opus \ freeswitch-mod-opus \
freeswitch-mod-png \
freeswitch-mod-rtc \
freeswitch-mod-say-en \
freeswitch-mod-sndfile \ freeswitch-mod-sndfile \
freeswitch-mod-sofia \ freeswitch-mod-sofia \
freeswitch-mod-spandsp \
freeswitch-mod-tone-stream \
freeswitch-mod-verto \
freeswitch-sounds-en-us-callie \ freeswitch-sounds-en-us-callie \
iptables iptables
# Potentially missing
# (included in bbb-freeswitch-core but not referenced in https://github.com/bigbluebutton/bigbluebutton/issues/9064)
# freeswitch-mod-cdr-csv
# freeswitch-mod-cdr-sqlite
# freeswitch-mod-h26x
# freeswitch-mod-skinny
# freeswitch-mod-sms
# freeswitch-mod-syslog
# freeswitch-mod-valet-parking
# freeswitch-mod-voicemail
# freeswitch-mod-xml-cdr
# freeswitch-mod-xml-rpc
# freeswitch-mod-xml-scgi
# -- get official bbb freeswitch config # -- get official bbb freeswitch config
# we use svn for retrieving the files since the repo is quite large, # we use svn for retrieving the files since the repo is quite large,
# git sparse-checkout is not yet available with buster and there # git sparse-checkout is not yet available with buster and there
# is no other sane way of downloading a single directory via git # is no other sane way of downloading a single directory via git
# TODO: ENV TAG v2.3-rc-1
# switch to official source RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-voice-conference/config/freeswitch/conf /etc/freeswitch \
# https://github.com/bigbluebutton/bigbluebutton/pull/11361
ENV GIT_TAG v2.3-alpha-6
RUN cd /etc \
&& svn checkout https://github.com/alangecker/bbb-packages/tags/$GIT_TAG/bbb-freeswitch-core/data/opt/freeswitch/etc/freeswitch \
&& rm -rf /etc/freeswitch/.svn && rm -rf /etc/freeswitch/.svn
# the current available freeswitch-mod-opusfile is broken, # the current available freeswitch-mod-opusfile is broken,

4
mod/freeswitch/conf/autoload_configs/acl.conf.xml
View File

@ -2,7 +2,6 @@
<network-lists> <network-lists>
<!-- <!--
These ACL's are automatically created on startup. These ACL's are automatically created on startup.
rfc1918.auto - RFC1918 Space rfc1918.auto - RFC1918 Space
nat.auto - RFC1918 Excluding your local lan. nat.auto - RFC1918 Excluding your local lan.
localnet.auto - ACL for your local lan. localnet.auto - ACL for your local lan.
@ -41,10 +40,9 @@
<list name="domains" default="allow"> <list name="domains" default="allow">
<!-- domain= is special it scans the domain from the directory to build the ACL --> <!-- domain= is special it scans the domain from the directory to build the ACL -->
<node type="allow" domain="$${domain}"/> <node type="allow" domain="$${domain}"/>
<node type="allow" domain="10.0.0.0/8"/>
<!-- use cidr= if you wish to allow ip ranges to this domains acl. --> <!-- use cidr= if you wish to allow ip ranges to this domains acl. -->
<!-- <node type="allow" cidr="192.168.0.0/24"/> --> <!-- <node type="allow" cidr="192.168.0.0/24"/> -->
</list> </list>
</network-lists> </network-lists>
</configuration> </configuration>

1
mod/freeswitch/conf/autoload_configs/conference.conf.xml.tmpl
View File

@ -221,6 +221,7 @@
<param name="caller-id-number" value="$${outbound_caller_id}"/> <param name="caller-id-number" value="$${outbound_caller_id}"/>
<!-- param name="comfort-noise" value="true"/ --> <!-- param name="comfort-noise" value="true"/ -->
<param name="comfort-noise" value="1400"/> <param name="comfort-noise" value="1400"/>
<param name="video-auto-floor-msec" value="2000"/>
<!-- <param name="conference-flags" value="video-floor-only|rfc-4579|livearray-sync|auto-3d-position|minimize-video-encoding"/> --> <!-- <param name="conference-flags" value="video-floor-only|rfc-4579|livearray-sync|auto-3d-position|minimize-video-encoding"/> -->

144
mod/freeswitch/conf/autoload_configs/modules.conf.xml
View File

@ -1,144 +0,0 @@
<configuration name="modules.conf" description="Modules">
<modules>
<!-- Loggers (I'd load these first) -->
<load module="mod_console"/>
<!-- <load module="mod_graylog2"/> -->
<!-- <load module="mod_logfile"/> -->
<!-- <load module="mod_syslog"/> -->
<!--<load module="mod_yaml"/>-->
<!-- Multi-Faceted -->
<!-- mod_enum is a dialplan interface, an application interface and an api command interface -->
<load module="mod_enum"/>
<!-- XML Interfaces -->
<!-- <load module="mod_xml_rpc"/> -->
<!-- <load module="mod_xml_curl"/> -->
<!-- <load module="mod_xml_cdr"/> -->
<!-- <load module="mod_xml_radius"/> -->
<!-- <load module="mod_xml_scgi"/> -->
<!-- Event Handlers -->
<!-- <load module="mod_amqp"/> -->
<!-- <load module="mod_cdr_csv"/> -->
<!-- <load module="mod_cdr_sqlite"/> -->
<!-- <load module="mod_event_multicast"/> -->
<load module="mod_event_socket"/>
<!-- <load module="mod_event_zmq"/> -->
<!-- <load module="mod_zeroconf"/> -->
<!-- <load module="mod_erlang_event"/> -->
<!-- <load module="mod_smpp"/> -->
<!-- <load module="mod_snmp"/> -->
<!-- Directory Interfaces -->
<!-- <load module="mod_ldap"/> -->
<!-- Endpoints -->
<!-- <load module="mod_dingaling"/> -->
<!-- <load module="mod_portaudio"/> -->
<!-- <load module="mod_alsa"/> -->
<load module="mod_sofia"/>
<load module="mod_loopback"/>
<!-- <load module="mod_woomera"/> -->
<!-- <load module="mod_freetdm"/> -->
<!-- <load module="mod_unicall"/> -->
<!-- <load module="mod_skinny"/> -->
<!-- <load module="mod_khomp"/> -->
<load module="mod_rtc"/>
<!-- <load module="mod_rtmp"/> -->
<load module="mod_verto"/>
<!-- Applications -->
<load module="mod_commands"/>
<load module="mod_conference"/>
<!-- <load module="mod_curl"/> -->
<load module="mod_db"/>
<load module="mod_dptools"/>
<load module="mod_expr"/>
<load module="mod_fifo"/>
<load module="mod_hash"/>
<!--<load module="mod_mongo"/> -->
<!--load module="mod_voicemail"/>-->
<!--<load module="mod_directory"/>-->
<!--<load module="mod_distributor"/>-->
<!--<load module="mod_lcr"/>-->
<!--<load module="mod_easyroute"/>-->
<load module="mod_esf"/>
<load module="mod_fsv"/>
<!--<load module="mod_cluechoo"/>-->
<!--load module="mod_valet_parking"/>-->
<!--<load module="mod_fsk"/>-->
<!--<load module="mod_spy"/>-->
<!--<load module="mod_sms"/>-->
<!--<load module="mod_smpp"/>-->
<!--<load module="mod_random"/>-->
<load module="mod_httapi"/>
<!--<load module="mod_translate"/>-->
<!-- SNOM Module -->
<!--<load module="mod_snom"/>-->
<!-- This one only works on Linux for now -->
<!--<load module="mod_ladspa"/>-->
<!-- Dialplan Interfaces -->
<!-- <load module="mod_dialplan_directory"/> -->
<load module="mod_dialplan_xml"/>
<load module="mod_dialplan_asterisk"/>
<!-- Codec Interfaces -->
<load module="mod_spandsp"/>
<load module="mod_g723_1"/>
<load module="mod_g729"/>
<load module="mod_amr"/>
<!--<load module="mod_ilbc"/>-->
<!--<load module="mod_h26x"/>-->
<load module="mod_b64"/>
<!--<load module="mod_siren"/>-->
<!--<load module="mod_isac"/>-->
<load module="mod_opus"/>
<load module="mod_opusfile"/>
<!-- File Format Interfaces -->
<load module="mod_sndfile"/>
<load module="mod_native_file"/>
<load module="mod_png"/>
<!-- <load module="mod_shell_stream"/> -->
<!--For icecast/mp3 streams/files-->
<!--<load module="mod_shout"/>-->
<!--For local streams (play all the files in a directory)-->
<load module="mod_local_stream"/>
<load module="mod_tone_stream"/>
<!-- Timers -->
<!-- <load module="mod_timerfd"/> -->
<!-- <load module="mod_posix_timer"/> -->
<!-- Languages -->
<!-- <load module="mod_v8"/> -->
<!-- <load module="mod_perl"/> -->
<!-- <load module="mod_python"/> -->
<!-- <load module="mod_java"/> -->
<load module="mod_lua"/>
<!-- ASR /TTS -->
<!-- <load module="mod_flite"/> -->
<!-- <load module="mod_pocketsphinx"/> -->
<!-- <load module="mod_cepstral"/> -->
<!-- <load module="mod_tts_commandline"/> -->
<!-- <load module="mod_rss"/> -->
<!-- Say -->
<load module="mod_say_en"/>
<!-- <load module="mod_say_ru"/> -->
<!-- <load module="mod_say_zh"/> -->
<!-- <load module="mod_say_sv"/> -->
<!-- Third party modules -->
<!--<load module="mod_nibblebill"/>-->
<!--<load module="mod_callcenter"/>-->
<!--<load module="mod_av"/-->
</modules>
</configuration>

1
mod/freeswitch/conf/dialplan/public.xml
View File

@ -1,6 +1,5 @@
<!-- <!--
NOTICE: NOTICE:
This context is usually accessed via the external sip profile listening on port 5080. This context is usually accessed via the external sip profile listening on port 5080.
It is recommended to have separate inbound and outbound contexts. Not only for security It is recommended to have separate inbound and outbound contexts. Not only for security

4
mod/freeswitch/conf/sip_profiles/external.xml
View File

@ -73,8 +73,8 @@
<param name="ext-sip-ip" value="auto-nat"/> <param name="ext-sip-ip" value="auto-nat"/>
--> -->
<param name="rtp-ip" value="0.0.0.0"/> <param name="rtp-ip" value="$${local_ip_v4}"/>
<param name="sip-ip" value="0.0.0.0"/> <param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
<param name="ext-sip-ip" value="$${external_sip_ip}"/> <param name="ext-sip-ip" value="$${external_sip_ip}"/>

56
mod/freeswitch/conf/vars.xml.tmpl
View File

@ -2,14 +2,10 @@
<!-- Preprocessor Variables <!-- Preprocessor Variables
These are introduced when configuration strings must be consistent across modules. These are introduced when configuration strings must be consistent across modules.
NOTICE: YOU CAN NOT COMMENT OUT AN X-PRE-PROCESS line, Remove the line instead. NOTICE: YOU CAN NOT COMMENT OUT AN X-PRE-PROCESS line, Remove the line instead.
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
YOU SHOULD CHANGE THIS default_password value if you don't want to be subject to any YOU SHOULD CHANGE THIS default_password value if you don't want to be subject to any
toll fraud in the future. It's your responsibility to secure your own system. toll fraud in the future. It's your responsibility to secure your own system.
This default config is used to demonstrate the feature set of FreeSWITCH. This default config is used to demonstrate the feature set of FreeSWITCH.
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
--> -->
<X-PRE-PROCESS cmd="set" data="default_password=1234"/> <X-PRE-PROCESS cmd="set" data="default_password=1234"/>
@ -18,7 +14,6 @@
The following variables are set dynamically - calculated if possible by freeswitch - and The following variables are set dynamically - calculated if possible by freeswitch - and
are available to the config as $${variable}. You can see their calculated value via fs_cli are available to the config as $${variable}. You can see their calculated value via fs_cli
by entering eval $${variable} by entering eval $${variable}
hostname hostname
local_ip_v4 local_ip_v4
local_mask_v4 local_mask_v4
@ -45,7 +40,6 @@
nat_public_addr nat_public_addr
nat_private_addr nat_private_addr
nat_type nat_type
--> -->
@ -53,7 +47,6 @@
<!-- <!--
This setting is what sets the default domain FreeSWITCH will use if all else fails. This setting is what sets the default domain FreeSWITCH will use if all else fails.
FreeSWICH will default to $${local_ip_v4} unless changed. Changing this setting does FreeSWICH will default to $${local_ip_v4} unless changed. Changing this setting does
affect the sip authentication. Please review conf/directory/default.xml for more affect the sip authentication. Please review conf/directory/default.xml for more
information on this topic. information on this topic.
@ -69,7 +62,6 @@
<X-PRE-PROCESS cmd="set" data="rtp_sdes_suites=AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH"/> <X-PRE-PROCESS cmd="set" data="rtp_sdes_suites=AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH"/>
<!-- <!--
Enable ZRTP globally you can override this on a per channel basis Enable ZRTP globally you can override this on a per channel basis
http://wiki.freeswitch.org/wiki/ZRTP (on how to enable zrtp) http://wiki.freeswitch.org/wiki/ZRTP (on how to enable zrtp)
--> -->
<X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/> <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
@ -77,9 +69,7 @@
NOTICE: When using SRTP it's critical that you do not offer or accept NOTICE: When using SRTP it's critical that you do not offer or accept
variable bit rate codecs, doing so would leak information and possibly variable bit rate codecs, doing so would leak information and possibly
compromise your SRTP stream. (FS-6404) compromise your SRTP stream. (FS-6404)
Supported SRTP Crypto Suites: Supported SRTP Crypto Suites:
AEAD_AES_256_GCM_8 AEAD_AES_256_GCM_8
____________________________________________________________________________ ____________________________________________________________________________
This algorithm is identical to AEAD_AES_256_GCM (see Section 5.2 of This algorithm is identical to AEAD_AES_256_GCM (see Section 5.2 of
@ -87,8 +77,6 @@
authentication tag with a length of 8 octets (64 bits) is used. authentication tag with a length of 8 octets (64 bits) is used.
An AEAD_AES_256_GCM_8 ciphertext is exactly 8 octets longer than its An AEAD_AES_256_GCM_8 ciphertext is exactly 8 octets longer than its
corresponding plaintext. corresponding plaintext.
AEAD_AES_128_GCM_8 AEAD_AES_128_GCM_8
____________________________________________________________________________ ____________________________________________________________________________
This algorithm is identical to AEAD_AES_128_GCM (see Section 5.1 of This algorithm is identical to AEAD_AES_128_GCM (see Section 5.1 of
@ -96,8 +84,6 @@
authentication tag with a length of 8 octets (64 bits) is used. authentication tag with a length of 8 octets (64 bits) is used.
An AEAD_AES_128_GCM_8 ciphertext is exactly 8 octets longer than its An AEAD_AES_128_GCM_8 ciphertext is exactly 8 octets longer than its
corresponding plaintext. corresponding plaintext.
AES_CM_256_HMAC_SHA1_80 | AES_CM_192_HMAC_SHA1_80 | AES_CM_128_HMAC_SHA1_80 AES_CM_256_HMAC_SHA1_80 | AES_CM_192_HMAC_SHA1_80 | AES_CM_128_HMAC_SHA1_80
____________________________________________________________________________ ____________________________________________________________________________
AES_CM_128_HMAC_SHA1_80 is the SRTP default AES Counter Mode cipher AES_CM_128_HMAC_SHA1_80 is the SRTP default AES Counter Mode cipher
@ -105,25 +91,18 @@
tag. The master-key length is 128 bits and has a default lifetime of tag. The master-key length is 128 bits and has a default lifetime of
a maximum of 2^48 SRTP packets or 2^31 SRTCP packets, whichever comes a maximum of 2^48 SRTP packets or 2^31 SRTCP packets, whichever comes
first. first.
AES_CM_256_HMAC_SHA1_32 | AES_CM_192_HMAC_SHA1_32 | AES_CM_128_HMAC_SHA1_32 AES_CM_256_HMAC_SHA1_32 | AES_CM_192_HMAC_SHA1_32 | AES_CM_128_HMAC_SHA1_32
____________________________________________________________________________ ____________________________________________________________________________
This crypto-suite is identical to AES_CM_128_HMAC_SHA1_80 except that This crypto-suite is identical to AES_CM_128_HMAC_SHA1_80 except that
the authentication tag is 32 bits. The length of the base64-decoded key and the authentication tag is 32 bits. The length of the base64-decoded key and
salt value for this crypto-suite MUST be 30 octets i.e., 240 bits; otherwise, salt value for this crypto-suite MUST be 30 octets i.e., 240 bits; otherwise,
the crypto attribute is considered invalid. the crypto attribute is considered invalid.
AES_CM_128_NULL_AUTH AES_CM_128_NULL_AUTH
____________________________________________________________________________ ____________________________________________________________________________
The SRTP default cipher (AES-128 Counter Mode), but to use no authentication The SRTP default cipher (AES-128 Counter Mode), but to use no authentication
method. This policy is NOT RECOMMENDED unless it is unavoidable; see method. This policy is NOT RECOMMENDED unless it is unavoidable; see
Section 7.5 of [RFC3711]. Section 7.5 of [RFC3711].
SRTP variables that modify behaviors based on direction/leg: SRTP variables that modify behaviors based on direction/leg:
rtp_secure_media rtp_secure_media
____________________________________________________________________________ ____________________________________________________________________________
possible values: possible values:
@ -132,16 +111,11 @@
forbidden - More useful for inbound to deny SAVP negotiation forbidden - More useful for inbound to deny SAVP negotiation
false - implies forbidden false - implies forbidden
true - implies mandatory true - implies mandatory
default if not set is accept SAVP inbound if offered. default if not set is accept SAVP inbound if offered.
rtp_secure_media_inbound | rtp_secure_media_outbound rtp_secure_media_inbound | rtp_secure_media_outbound
____________________________________________________________________________ ____________________________________________________________________________
This is the same as rtp_secure_media, but would apply to either inbound This is the same as rtp_secure_media, but would apply to either inbound
or outbound offers specifically. or outbound offers specifically.
How to specify crypto suites: How to specify crypto suites:
____________________________________________________________________________ ____________________________________________________________________________
By default without specifying any crypto suites FreeSWITCH will offer By default without specifying any crypto suites FreeSWITCH will offer
@ -149,23 +123,17 @@
endpoint has in common. If you wish to force specific crypto suites you endpoint has in common. If you wish to force specific crypto suites you
can do so by appending the suites in a comma separated list in the order can do so by appending the suites in a comma separated list in the order
that you wish to offer them in. that you wish to offer them in.
Examples: Examples:
rtp_secure_media=mandatory:AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32 rtp_secure_media=mandatory:AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32
rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32 rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32
rtp_secure_media=optional:AES_CM_256_HMAC_SHA1_80 rtp_secure_media=optional:AES_CM_256_HMAC_SHA1_80
rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80 rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80
Additionally you can narrow this down on either inbound or outbound by Additionally you can narrow this down on either inbound or outbound by
specifying as so: specifying as so:
rtp_secure_media_inbound=true:AEAD_AES_256_GCM_8 rtp_secure_media_inbound=true:AEAD_AES_256_GCM_8
rtp_secure_media_inbound=mandatory:AEAD_AES_256_GCM_8 rtp_secure_media_inbound=mandatory:AEAD_AES_256_GCM_8
rtp_secure_media_outbound=true:AEAD_AES_128_GCM_8 rtp_secure_media_outbound=true:AEAD_AES_128_GCM_8
rtp_secure_media_outbound=optional:AEAD_AES_128_GCM_8 rtp_secure_media_outbound=optional:AEAD_AES_128_GCM_8
rtp_secure_media_suites rtp_secure_media_suites
____________________________________________________________________________ ____________________________________________________________________________
Optionaly you can use rtp_secure_media_suites to dictate the suite list Optionaly you can use rtp_secure_media_suites to dictate the suite list
@ -174,14 +142,10 @@
--> -->
<!-- <!--
Examples of codec options: (module must be compiled and loaded) Examples of codec options: (module must be compiled and loaded)
codecname[@8000h|16000h|32000h[@XXi]] codecname[@8000h|16000h|32000h[@XXi]]
XX is the frame size must be multples allowed for the codec XX is the frame size must be multples allowed for the codec
FreeSWITCH can support 10-120ms on some codecs. FreeSWITCH can support 10-120ms on some codecs.
We do not support exceeding the MTU of the RTP packet. We do not support exceeding the MTU of the RTP packet.
iLBC@30i - iLBC using mode=30 which will win in all cases. iLBC@30i - iLBC using mode=30 which will win in all cases.
DVI4@8000h@20i - IMA ADPCM 8kHz using 20ms ptime. (multiples of 10) DVI4@8000h@20i - IMA ADPCM 8kHz using 20ms ptime. (multiples of 10)
DVI4@16000h@40i - IMA ADPCM 16kHz using 40ms ptime. (multiples of 10) DVI4@16000h@40i - IMA ADPCM 16kHz using 40ms ptime. (multiples of 10)
@ -208,23 +172,17 @@
AAL2-G726-40 - Same as G726-40 but using AAL2 packing. (multiples of 10) AAL2-G726-40 - Same as G726-40 but using AAL2 packing. (multiples of 10)
LPC - LPC10 using 90ms ptime (only supports 90ms at this time in FreeSWITCH) LPC - LPC10 using 90ms ptime (only supports 90ms at this time in FreeSWITCH)
L16 - L16 isn't recommended for VoIP but you can do it. L16 can exceed the MTU rather quickly. L16 - L16 isn't recommended for VoIP but you can do it. L16 can exceed the MTU rather quickly.
These are the passthru audio codecs: These are the passthru audio codecs:
G729 - G729 in passthru mode. (mod_g729) G729 - G729 in passthru mode. (mod_g729)
G723 - G723.1 in passthru mode. (mod_g723_1) G723 - G723.1 in passthru mode. (mod_g723_1)
AMR - AMR in passthru mode. (mod_amr) AMR - AMR in passthru mode. (mod_amr)
These are the passthru video codecs: (mod_h26x) These are the passthru video codecs: (mod_h26x)
H261 - H.261 Video H261 - H.261 Video
H263 - H.263 Video H263 - H.263 Video
H263-1998 - H.263-1998 Video H263-1998 - H.263-1998 Video
H263-2000 - H.263-2000 Video H263-2000 - H.263-2000 Video
H264 - H.264 Video H264 - H.264 Video
RTP Dynamic Payload Numbers currently used in FreeSWITCH and what for. RTP Dynamic Payload Numbers currently used in FreeSWITCH and what for.
96 - AMR 96 - AMR
97 - iLBC (30) 97 - iLBC (30)
98 - iLBC (20) 98 - iLBC (20)
@ -257,7 +215,6 @@
125 - 125 -
126 - 126 -
127 - BV32 127 - BV32
--> -->
<X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,speex@16000h@20i,speex@8000h@20i,G722,PCMU,PCMA"/> <X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,speex@16000h@20i,speex@8000h@20i,G722,PCMU,PCMA"/>
<X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,speex@16000h@20i,G722,PCMU,PCMA"/> <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,speex@16000h@20i,G722,PCMU,PCMA"/>
@ -274,9 +231,7 @@
<X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/> <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/>
<!-- <!--
THIS IS ONLY USED FOR DINGALING THIS IS ONLY USED FOR DINGALING
bind_server_ip bind_server_ip
Can be an ip address, a dns name, or "auto". Can be an ip address, a dns name, or "auto".
This determines an ip address available on this host to bind. This determines an ip address available on this host to bind.
If you are separating RTP and SIP traffic, you will want to have If you are separating RTP and SIP traffic, you will want to have
@ -286,7 +241,6 @@
<X-PRE-PROCESS cmd="set" data="bind_server_ip=auto"/> <X-PRE-PROCESS cmd="set" data="bind_server_ip=auto"/>
<!-- NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE <!-- NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
If you're going to load test FreeSWITCH please input real IP addresses If you're going to load test FreeSWITCH please input real IP addresses
for external_rtp_ip and external_sip_ip for external_rtp_ip and external_sip_ip
--> -->
@ -373,11 +327,9 @@
<!-- <!--
Digits Dialed filter: (FS-6940) Digits Dialed filter: (FS-6940)
The digits stream may contain valid credit card numbers or social security numbers, These digit The digits stream may contain valid credit card numbers or social security numbers, These digit
filters will allow you to make a valant effort to stamp out sensitive information for filters will allow you to make a valant effort to stamp out sensitive information for
PCI/HIPPA compliance. (see xml_cdr dialed_digits) PCI/HIPPA compliance. (see xml_cdr dialed_digits)
df_us_ssn = US Social Security Number pattern df_us_ssn = US Social Security Number pattern
df_us_luhn = Visa, MasterCard, American Express, Diners Club, Discover and JCB df_us_luhn = Visa, MasterCard, American Express, Diners Club, Discover and JCB
--> -->
@ -389,7 +341,6 @@
<!-- <!--
Setting up your default sip provider is easy. Setting up your default sip provider is easy.
Below are some values that should work in most cases. Below are some values that should work in most cases.
These are for conf/directory/default/example.com.xml These are for conf/directory/default/example.com.xml
--> -->
<X-PRE-PROCESS cmd="set" data="default_provider=example.com"/> <X-PRE-PROCESS cmd="set" data="default_provider=example.com"/>
@ -402,20 +353,15 @@
<!-- <!--
SIP and TLS settings. http://wiki.freeswitch.org/wiki/Tls SIP and TLS settings. http://wiki.freeswitch.org/wiki/Tls
valid options: sslv2,sslv3,sslv23,tlsv1,tlsv1.1,tlsv1.2 valid options: sslv2,sslv3,sslv23,tlsv1,tlsv1.1,tlsv1.2
default: tlsv1,tlsv1.1,tlsv1.2 default: tlsv1,tlsv1.1,tlsv1.2
--> -->
<X-PRE-PROCESS cmd="set" data="sip_tls_version=tlsv1,tlsv1.1,tlsv1.2"/> <X-PRE-PROCESS cmd="set" data="sip_tls_version=tlsv1,tlsv1.1,tlsv1.2"/>
<!-- <!--
TLS cipher suite: default ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH TLS cipher suite: default ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
The actual ciphers supported will change per platform. The actual ciphers supported will change per platform.
openssl ciphers -v 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH' openssl ciphers -v 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH'
Will show you what is available in your verion of openssl. Will show you what is available in your verion of openssl.
--> -->
<X-PRE-PROCESS cmd="set" data="sip_tls_ciphers=ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"/> <X-PRE-PROCESS cmd="set" data="sip_tls_ciphers=ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"/>
@ -448,4 +394,4 @@
<X-PRE-PROCESS cmd="set" data="video_mute_png=$${images_dir}/default-mute.png"/> <X-PRE-PROCESS cmd="set" data="video_mute_png=$${images_dir}/default-mute.png"/>
<X-PRE-PROCESS cmd="set" data="video_no_avatar_png=$${images_dir}/default-avatar.png"/> <X-PRE-PROCESS cmd="set" data="video_no_avatar_png=$${images_dir}/default-avatar.png"/>
</include> </include>

6
mod/fsesl-akka/Dockerfile
View File

@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
RUN apt-get update && apt-get install -y subversion RUN apt-get update && apt-get install -y subversion
# download bbb-common-message # download bbb-common-message
ENV TAG_COMMON_MESSAGE v2.3-beta-4 ENV TAG_COMMON_MESSAGE v2.3-rc-1
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -13,7 +13,7 @@ RUN cd /bbb-common-message \
# =================================================== # ===================================================
ENV TAG_FSESL v2.3-beta-4 ENV TAG_FSESL v2.3-rc-1
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \
&& rm -rf /bbb-fsesl-client/.svn && rm -rf /bbb-fsesl-client/.svn
@ -21,7 +21,7 @@ RUN cd /bbb-fsesl-client \
&& ./deploy.sh && ./deploy.sh
ENV TAG v2.3-beta-4 ENV TAG v2.3-rc-1
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \
&& rm -rf /source/.svn && rm -rf /source/.svn

2
mod/html5/Dockerfile
View File

@ -14,7 +14,7 @@ USER meteor
ENV METEOR_VERSION 1.10.2 ENV METEOR_VERSION 1.10.2
RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
ENV TAG v2.3-beta-4 ENV TAG v2.3-rc-1
RUN cd ~ \ RUN cd ~ \
&& svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \ && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
&& mv ~/bigbluebutton-html5 ~/source \ && mv ~/bigbluebutton-html5 ~/source \

11
mod/html5/settings.yml
View File

@ -20,7 +20,7 @@ public:
appName: BigBlueButton HTML5 Client appName: BigBlueButton HTML5 Client
bbbServerVersion: 2.3-dev-docker bbbServerVersion: 2.3-dev-docker
copyright: '©2021 BigBlueButton Inc.' copyright: '©2021 BigBlueButton Inc.'
html5ClientBuild: "1617-docker" html5ClientBuild: "1643-docker"
helpLink: https://bigbluebutton.org/html5/ helpLink: https://bigbluebutton.org/html5/
lockOnJoin: true lockOnJoin: true
cdn: '' cdn: ''
@ -269,6 +269,14 @@ public:
autoShareWebcam: {{ .Env.AUTO_SHARE_WEBCAM }} autoShareWebcam: {{ .Env.AUTO_SHARE_WEBCAM }}
skipVideoPreview: {{ .Env.DISABLE_VIDEO_PREVIEW }} skipVideoPreview: {{ .Env.DISABLE_VIDEO_PREVIEW }}
skipVideoPreviewOnFirstJoin: false skipVideoPreviewOnFirstJoin: false
# cameraSortingModes.paginationSorting: sorting mode to be applied when pagination is active
# cameraSortingModes.defaultSorting: sorting mode when pagination is not active (full mesh)
# Current implemented modes are:
# 'LOCAL_ALPHABETICAL' | 'VOICE_ACTIVITY_LOCAL' | 'LOCAL_VOICE_ACTIVITY' | 'LOCAL_PRESENTER_ALPHABETICAL'
# The algorithm names are self-explanatory.
cameraSortingModes:
defaultSorting: LOCAL_ALPHABETICAL
paginationSorting: VOICE_ACTIVITY_LOCAL
# Entry `thresholds` is an array of: # Entry `thresholds` is an array of:
# - threshold: minimum number of cameras being shared for profile to applied # - threshold: minimum number of cameras being shared for profile to applied
# profile: a camera profile id from the cameraProfiles configuration array # profile: a camera profile id from the cameraProfiles configuration array
@ -392,7 +400,6 @@ public:
autoSwapLayout: false autoSwapLayout: false
hidePresentation: false hidePresentation: false
showParticipantsOnLogin: true showParticipantsOnLogin: true
webcamsDefaultPlacement: 'top'
media: media:
stunTurnServersFetchAddress: '/bigbluebutton/api/stuns' stunTurnServersFetchAddress: '/bigbluebutton/api/stuns'
cacheStunTurnServers: true cacheStunTurnServers: true

10
mod/jodconverter/Dockerfile Normal file
View File

@ -0,0 +1,10 @@
FROM eugenmayer/jodconverter:rest
RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections
RUN sed -i 's/main/main contrib/' /etc/apt/sources.list && apt-get update
RUN apt-get update && apt -y install --no-install-recommends \
fonts-crosextra-carlito \
fonts-crosextra-caladea \
fonts-noto \
fonts-noto-cjk \
fontconfig \
ttf-mscorefonts-installer

2
mod/webrtc-sfu/bbb-webrtc-sfu

@ -1 +1 @@
Subproject commit b73bd74a6ef682a38e14a482aed15887a7413f18 Subproject commit f38b369060999c0b3b18f029b38ad3e559e1225d