From 0d388be4ff418b69804ce2da6e1a14cd35081a8b Mon Sep 17 00:00:00 2001 From: chandi Date: Thu, 9 Apr 2020 18:13:18 +0200 Subject: [PATCH] separate kurento --- Dockerfile | 4 ++ docker-compose.yml | 16 ++++- mod/bbb-webrtc-sfu/config.yml | 2 +- mod/kurento/WebRtcEndpoint.conf.ini | 91 ----------------------------- 4 files changed, 20 insertions(+), 93 deletions(-) delete mode 100644 mod/kurento/WebRtcEndpoint.conf.ini diff --git a/Dockerfile b/Dockerfile index 7089cfe..b0d0178 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,9 @@ RUN equivs-control redis-server.control \ && equivs-control bbb-etherpad.control \ && sed -i 's//bbb-etherpad/g' bbb-etherpad.control \ && equivs-build bbb-etherpad.control \ + && equivs-control kurento-media-server.control \ + && sed -i 's//kurento-media-server/g' kurento-media-server.control \ + && equivs-build kurento-media-server.control \ && dpkg -i /*.deb \ && rm /*.deb @@ -52,6 +55,7 @@ RUN rm -f /etc/systemd/system/nginx.service COPY dummy/dummy.service /etc/systemd/system/nginx.service COPY dummy/dummy.service /etc/systemd/system/redis.service COPY dummy/dummy.service /etc/systemd/system/redis-server.service +COPY dummy/dummy.service /etc/systemd/system/kurento-media-server.service RUN apt-get install -y nodejs diff --git a/docker-compose.yml b/docker-compose.yml index 56811a3..67d1fb0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,6 @@ services: - ./mod/html5/config.yml:/usr/share/meteor/bundle/programs/server/assets/app/config/settings.yml - ./mod/web/override.conf:/etc/systemd/system/bbb-web.service.d/override.conf - ./mod/web/bigbluebutton.properties:/usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties - - ./mod/kurento/WebRtcEndpoint.conf.ini:/etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini - ./mod/bbb-webrtc-sfu/config.yml:/usr/local/bigbluebutton/bbb-webrtc-sfu/config/default.yml network_mode: host @@ -57,6 +56,21 @@ services: networks: bluenet: ipv4_address: 10.7.7.5 + + kurento: + image: kurento/kurento-media-server:6.13 + # ports: + # # - "127.0.0.1:8889:8888" + environment: + KMS_STUN_IP: 64.233.177.127 # google stun server + KMS_STUN_PORT: 19302 + KMS_MIN_PORT: 24577 + KMS_MAX_PORT: 32768 + KMS_EXTERNAL_ADDRESS: + KMS_TURN_URL: + networks: + bluenet: + ipv4_address: 10.7.7.6 networks: bluenet: diff --git a/mod/bbb-webrtc-sfu/config.yml b/mod/bbb-webrtc-sfu/config.yml index af3c271..8770727 100644 --- a/mod/bbb-webrtc-sfu/config.yml +++ b/mod/bbb-webrtc-sfu/config.yml @@ -1,6 +1,6 @@ kurento: - ip: 144.76.97.34 - url: ws://127.0.0.1:8888/kurento + url: ws://10.7.7.6:8888/kurento # mediaType: (main|audio|content) ipClassMappings: local: diff --git a/mod/kurento/WebRtcEndpoint.conf.ini b/mod/kurento/WebRtcEndpoint.conf.ini deleted file mode 100644 index 73d9e90..0000000 --- a/mod/kurento/WebRtcEndpoint.conf.ini +++ /dev/null @@ -1,91 +0,0 @@ -;; External (public) IP address of the media server. -;; -;; If you know what will be the external or public IP address of the media server -;; (e.g. because your deployment has an static IP), you can specify it here. -;; Doing so has the advantage of not needing to configure STUN/TURN for the media -;; server. -;; -;; STUN/TURN are needed only when the media server sits behind a NAT and needs to -;; find out its own external IP address. However, if you set a static external IP -;; address with this parameter, then there is no need for the STUN/TURN -;; auto-discovery. -;; -;; The effect of this parameter is that ALL local ICE candidates that are -;; gathered (for WebRTC) will contain the provided external IP address instead of -;; the local one. -;; -;; is an IPv4 or IPv6 address. -;; -;; Examples: -;; externalAddress=10.20.30.40 -;; externalAddress=2001:0db8:85a3:0000:0000:8a2e:0370:7334 -;; -;externalAddress=10.20.30.40 - -;; Local network interfaces used for ICE gathering. -;; -;; If you know which network interfaces should be used to perform ICE (for -;; WebRTC connectivity), you can define them here. Doing so has several -;; advantages: -;; -;; * The WebRTC ICE gathering process will be much quicker. Normally, it needs -;; to gather local candidates for all of the network interfaces, but this step -;; can be made faster if you limit it to only the interface that you know will -;; work. -;; -;; * It will ensure that the media server always decides to use the correct -;; network interface. With WebRTC ICE gathering it's possible that, under some -;; circumstances (in systems with virtual network interfaces such as -;; "docker0") the ICE process ends up choosing the wrong local IP. -;; -;; is a comma-separated list of network interface names. -;; -;; Examples: -;; networkInterfaces=eth0 -;; networkInterfaces=eth0,enp0s25 -;; -;networkInterfaces=eth0 - -;; STUN server IP address. -;; -;; The ICE process uses STUN to punch holes through NAT firewalls. -;; -;; MUST be an IP address; domain names are NOT supported. -;; -;; You need to use a well-working STUN server. Use this to check if it works: -;; https://webrtc.github.io/samples/src/content/peerconnection/trickle-ice/ -;; -;; From that check, you should get at least one Server-Reflexive Candidate -;; (type "srflx"). -;; -stunServerAddress=64.233.177.127 # google stun server -stunServerPort=19302 - -;; TURN server URL. -;; -;; When STUN is not enough to open connections through some NAT firewalls, -;; using TURN is the remaining alternative. -;; -;; Note that TURN is a superset of STUN, so you don't need to configure STUN -;; if you are using TURN. -;; -;; The provided URL should follow one of these formats: -;; -;; * user:password@ipaddress:port -;; * user:password@ipaddress:port?transport=[udp|tcp|tls] -;; -;; MUST be an IP address; domain names are NOT supported. -;; is OPTIONAL. Possible values: udp, tcp, tls. Default: udp. -;; -;; You need to use a well-working TURN server. Use this to check if it works: -;; https://webrtc.github.io/samples/src/content/peerconnection/trickle-ice/ -;; -;; From that check, you should get at least one Server-Reflexive Candidate -;; (type "srflx") AND one Relay Candidate (type "relay"). -;; -;turnURL=user:password@127.0.0.1:3478?transport=udp - -;pemCertificate is deprecated. Please use pemCertificateRSA instead -;pemCertificate= -;pemCertificateRSA= -;pemCertificateECDSA=