Merge branch 'councilbox' into master

.gitignore

@@ -24,4 +24,5 @@ nbactions.xml
 .idea/
 log/
 \.vscode/
-*.iml
+*.iml
+

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

@@ -1,5 +1,5 @@
 FROM ubuntu:16.04
-MAINTAINER openvidu@gmail.com
+MAINTAINER miguel.rodriguez@cocodin.com
 
 # Install Kurento Media Server (KMS) 
 RUN	echo "deb http://ubuntu.kurento.org xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \
@@ -21,8 +21,9 @@ RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists
 RUN mkdir -p /var/log/supervisor
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
+
 # Copy OpenVidu Server
-COPY openvidu-server.jar openvidu-server.jar
+COPY openvidu-server-cbx.jar openvidu-server-cbx.jar
 
 EXPOSE 8888
 EXPOSE 9091

openvidu-server/docker/openvidu-server-kms/create_image.sh

@@ -1,5 +1,5 @@
-cp ../../target/openvidu-server-"$1".jar ./openvidu-server.jar
+cp ../../target/openvidu-server-"$1".jar ./openvidu-server-cbx.jar
 
-docker build -t openvidu/openvidu-server-kms .
+docker build -t councilbox/server-kms .
 
-rm ./openvidu-server.jar
+rm ./openvidu-server-cbx.jar

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 -Dopenvidu.publicurl=docker-local /openvidu-server.jar"
+command=/bin/bash -c "java -jar -Dopenvidu.publicurl=docker-local /openvidu-server-cbx.jar"
 redirect_stderr=true

openvidu-server/docker/openvidu-server/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:16.04
-MAINTAINER openvidu@gmail.com
+MAINTAINER miguel.rodriguez@cocodin.com
 
 # Install Java
 RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/*
@@ -12,7 +12,7 @@ RUN mkdir -p /var/log/supervisor
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 # Copy OpenVidu Server
-COPY openvidu-server.jar /
+COPY openvidu-server-cbx.jar /
 
 EXPOSE 8443
 EXPOSE 8888

openvidu-server/docker/openvidu-server/create_image.sh

@@ -1,5 +1,5 @@
-cp ../../target/openvidu-server-"$1".jar ./openvidu-server.jar
+cp ../../target/openvidu-server-"$1".jar ./openvidu-server-cbx.jar
 
-docker build -t openvidu/openvidu-server .
+docker build -t councilbox/server-java .
 
-rm ./openvidu-server.jar
+rm ./openvidu-server-cbx.jar

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

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

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

@@ -5,7 +5,7 @@ server.ssl.enabled: false
 server.address: 0.0.0.0
 
 kms.uris=[\"ws://localhost:8888/kurento\"]
-openvidu.secret: MY_SECRET
+openvidu.secret: YOUR_SECRET
 openvidu.publicurl: ngrok
 openvidu.cdr: false
 openvidu.recording: false

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

@@ -1,19 +1,15 @@
 server.address: 0.0.0.0
 server.ssl.enabled: true
 openvidu.recording.version: 1.8.0
-
-
-
 server.port: 8443
-server.ssl.key-store: classpath:openvidu-selfsigned.jks
-server.ssl.key-store-password: openvidu
+server.ssl.key-store: classpath:cbx_cert.jks
+server.ssl.key-store-password: C0uncilbox@2016
 server.ssl.key-store-type: JKS
-server.ssl.key-alias: openvidu-selfsigned
+server.ssl.key-alias: cbx_cert
 kms.uris=[\"ws://localhost:8888/kurento\"]
-
-openvidu.secret: MY_SECRET
+openvidu.secret: YOUR_SECRET
 openvidu.publicurl: local
 openvidu.cdr: false
-openvidu.recording: false
-openvidu.recording.path: /opt/openvidu/recordings
+openvidu.recording: true
+openvidu.recording.path: /home/recordings
 openvidu.recording.free-access: false

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

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+command=$(docker run -d -p 8443:8443 --name server-kms \
+-v /var/run/docker.sock:/var/run/docker.sock \
+-v /home/recordings:/home/recordings \
+-e openvidu.recording=true \
+-e openvidu.recording.path=/home/recordings \
+-e openvidu.recording.free-access=true \
+-e openvidu.secret=YOUR_SECRET \
+-e openvidu.publicurl=https://217.182.136.130:8443/ \
+--net="host" \
+councilbox/server-kms:1.7.0)
+
+echo $command