Merge branch 'councilbox' into master

openvidu-browser/package.json

@@ -49,4 +49,4 @@
     }, 
     "types": "lib/index.d.ts", 
     "version": "2.0.0"
-}
+}

openvidu-server/docker/openvidu-server-kms/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:16.04
 MAINTAINER miguel.rodriguez@cocodin.com
 
 # Install Kurento Media Server (KMS) 
-RUN echo "deb http://ubuntu.openvidu.io/6.7.0 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \
+RUN echo "deb http://ubuntu.openvidu.io/6.7.1 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5AFA7A83 \
 	&& apt-get update \
 	&& apt-get -y dist-upgrade \
@@ -10,6 +10,9 @@ RUN echo "deb http://ubuntu.openvidu.io/6.7.0 xenial kms6" | tee /etc/apt/source
 	&& apt-get -y install openh264-gst-plugins-bad-1.5 \
 	&& rm -rf /var/lib/apt/lists/*
 
+
+COPY kms.sh /kms.sh
+
 # Install Java
 RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/*
 
@@ -29,7 +32,7 @@ COPY kms.sh /kms.sh
 
 EXPOSE 8888
 EXPOSE 9091
-EXPOSE 4443
+EXPOSE 8443
 
 # Exec supervisord
 CMD ["/usr/bin/supervisord"]

openvidu-server/docker/openvidu-server-kms/supervisord.conf

@@ -9,5 +9,5 @@ command=/bin/bash /kms.sh
 redirect_stderr=true
 
 [program:openvidu-server]
-command=/bin/bash -c "java -jar -Dspring.profiles.active=docker /openvidu-server.jar"
+command=/bin/bash -c "java -jar -Dspring.profiles.active=docker /openvidu-server-cbx.jar"
 redirect_stderr=true

openvidu-server/docker/openvidu-server/Dockerfile

@@ -14,7 +14,7 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 # Copy OpenVidu Server
 COPY openvidu-server-cbx.jar /
 
-EXPOSE 4443
+EXPOSE 8443
 EXPOSE 8888
 
 # Exec supervisord

openvidu-server/docker/openvidu-server/supervisord.conf

@@ -5,5 +5,5 @@ pidfile=/var/run/supervisord.pid;
 loglevel=debug
 
 [program:openvidu-server]
-command=/bin/bash -c "java -jar -Dspring.profiles.active=docker /openvidu-server.jar"
+command=/bin/bash -c "java -jar -Dspring.profiles.active=docker /openvidu-server-cbx.jar"
 redirect_stderr=true

openvidu-server/src/main/resources/application.properties

@@ -2,16 +2,19 @@ server.address: 0.0.0.0
 server.ssl.enabled: true
 openvidu.recording.version: 2.0.0
 server.port: 8443
-server.ssl.key-store: classpath:cbx_cert.jks
+server.ssl.key-store: /home/openvidu_certs/councilbox.jks
 server.ssl.key-store-password: C0uncilbox@2016
+#server.ssl.key-store: classpath:cbx_cert.jks
 server.ssl.key-store-type: JKS
-server.ssl.key-alias: cbx_cert
+server.ssl.key-alias: councilbox
+
+#kms.uris=[\"ws://217.182.136.130:8888/kurento\"]
 kms.uris=[\"ws://localhost:8888/kurento\"]
-openvidu.secret: YOUR_SECRET
-openvidu.publicurl: local
+openvidu.secret: uincBgf9ysUCIo4MNbrfMg5hsX6FYYak
+openvidu.publicurl: https://172.18.2.38:8443
 openvidu.cdr: false
 openvidu.recording: false
 openvidu.recording.path: /home/recordings
 openvidu.recording.public-access: false
 openvidu.recording.notification: publisher_moderator
-openvidu.recording.custom-layout: /opt/openvidu/custom-layout
+openvidu.recording.custom-layout: 

openvidu-server/src/main/resources/councilbox_server_kms_docker.sh

@@ -9,6 +9,6 @@ command=$(docker run -d -p 8443:8443 --name server-kms \
 -e openvidu.secret=YOUR_SECRET \
 -e openvidu.publicurl=https://217.182.136.130:8443/ \
 --net="host" \
-councilbox/server-kms:1.7.0)
+councilbox/server-kms:1.8.0)
 
 echo $command