diff --git a/Dockerfile b/Dockerfile index 7f96e08..6a0f3b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER ffdixon@bigbluebutton.org ENV DEBIAN_FRONTEND noninteractive -RUN echo 'Acquire::http::Proxy "http://10.0.9.74:3142 ";' > /etc/apt/apt.conf.d/01proxy +RUN echo 'Acquire::http::Proxy "http://192.168.0.130:3142 ";' > /etc/apt/apt.conf.d/01proxy RUN apt-get update && apt-get install -y wget software-properties-common RUN echo "deb http://ubuntu.bigbluebutton.org/xenial-200 bigbluebutton-xenial main " | tee /etc/apt/sources.list.d/bigbluebutton.list @@ -44,10 +44,7 @@ RUN apt-get update && apt-get install -y nodejs # -- Install HTML5 client RUN apt-get install -y bbb-html5 - -RUN echo 'Acquire::http::Proxy "http://192.168.0.16:3142 ";' > /etc/apt/apt.conf.d/01proxy -RUN apt-get update -RUN apt-get install -y coturn vim +RUN apt-get install -y coturn vim mlocate # -- Install supervisor to run all the BigBlueButton processes (replaces systemd) RUN apt-get install -y supervisor diff --git a/setup.sh b/setup.sh index 4181bbd..dc85b1e 100755 --- a/setup.sh +++ b/setup.sh @@ -23,7 +23,7 @@ change_var_value () { sed -i "s<^[[:blank:]#]*\(${2}\).*<\1=${3}<" $1 } -# docker run -p 80:80/tcp -p 443:443/tcp -p 1935:1935/tcp -p 5066:5066/tcp -p 3478:3478/udp -p 3478:3478/tcp --cap-add=NET_ADMIN bigbluebutton/d2 -h 10.0.9.74 +# docker run -p 80:80/tcp -p 443:443/tcp -p 1935:1935/tcp -p 5066:5066/tcp -p 3478:3478/udp -p 3478:3478/tcp --cap-add=NET_ADMIN bigbluebutton/d2 -h 192.168.0.130 while getopts "eh:" opt; do case $opt in @@ -120,10 +120,10 @@ cat > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini << HERE ; You have to find a valid stun server. You can check if it works ; usin this tool: ; http://webrtc.github.io/samples/src/content/peerconnection/trickle-ice/ -stunServerAddress=64.233.177.127 -stunServerPort=19302 +;stunServerAddress=64.233.177.127 +;stunServerPort=19302 -turnURL=user:password@${HOST}:3478 +turnURL=kurento:kurento@${HOST}:3478 ;pemCertificate is deprecated. Please use pemCertificateRSA instead ;pemCertificate= @@ -149,6 +149,7 @@ lt-cred-mech use-auth-secret static-auth-secret=$TURN_SECRET user=user:password +log-file=/var/log/turn.log HERE # Setup tomcat7 to use the TURN server (wiht matching secret) @@ -237,9 +238,12 @@ export KURENTO_LOGS_PATH=$DAEMON_LOG cat << HERE - BigBlueButton is running at http://$HOST/ +BigBlueButton is running at + + http://$HOST HERE -exec /usr/bin/supervisord +updatedb +exec /usr/bin/supervisord > /var/log/supervisord.log diff --git a/supervisord.conf b/supervisord.conf index 75068aa..f6fcba7 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -108,5 +108,5 @@ command=/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/bin/java -Djava.util.logging.c startsecs = 0 autorestart = false user=turnserver -command=/usr/bin/turnserver -c /etc/turnserver.conf +command=/usr/bin/turnserver -c /etc/turnserver.conf -u kurento:kurento