From f13bb62a6b97df9d8769dfff3c80fa33558ac70b Mon Sep 17 00:00:00 2001
From: "miguel.rodriguez" <miguel.rodriguez@cocodin.com>
Date: Fri, 2 Feb 2018 17:36:48 +0100
Subject: [PATCH 1/3] Added ignored files to gitignore, modified creation of
 docker images.

---
 .gitignore                                                  | 3 +++
 openvidu-server/docker/openvidu-server-kms/Dockerfile       | 4 ++--
 openvidu-server/docker/openvidu-server-kms/create_image.sh  | 6 +++---
 openvidu-server/docker/openvidu-server-kms/supervisord.conf | 2 +-
 openvidu-server/docker/openvidu-server/Dockerfile           | 4 ++--
 openvidu-server/docker/openvidu-server/create_image.sh      | 6 +++---
 openvidu-server/docker/openvidu-server/supervisord.conf     | 2 +-
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index af572e5e..d3a49dd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ nbactions.xml
 .externalToolBuilders
 *bin/
 /.vscode
+
+.idea/
+*.iml
diff --git a/openvidu-server/docker/openvidu-server-kms/Dockerfile b/openvidu-server/docker/openvidu-server-kms/Dockerfile
index 3a756bcb..97e1ec10 100644
--- a/openvidu-server/docker/openvidu-server-kms/Dockerfile
+++ b/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 \
@@ -20,7 +20,7 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
 
 # Install OpenVidu Server
-COPY openvidu-server.jar openvidu-server.jar
+COPY openvidu-server-cbx.jar openvidu-server-cbx.jar
 
 EXPOSE 8888
 EXPOSE 9091
diff --git a/openvidu-server/docker/openvidu-server-kms/create_image.sh b/openvidu-server/docker/openvidu-server-kms/create_image.sh
index 2f5c47f5..4e108a7d 100755
--- a/openvidu-server/docker/openvidu-server-kms/create_image.sh
+++ b/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
diff --git a/openvidu-server/docker/openvidu-server-kms/supervisord.conf b/openvidu-server/docker/openvidu-server-kms/supervisord.conf
index 9e6e62b6..d93c0793 100644
--- a/openvidu-server/docker/openvidu-server-kms/supervisord.conf
+++ b/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 /openvidu-server.jar"
+command=/bin/bash -c "java -jar /openvidu-server-cbx.jar"
 redirect_stderr=true
\ No newline at end of file
diff --git a/openvidu-server/docker/openvidu-server/Dockerfile b/openvidu-server/docker/openvidu-server/Dockerfile
index 1c07a8f8..70c42067 100644
--- a/openvidu-server/docker/openvidu-server/Dockerfile
+++ b/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/*
@@ -10,7 +10,7 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
 
 # Copy OpenVidu Server
-COPY openvidu-server.jar /
+COPY openvidu-server-cbx.jar /
 
 EXPOSE 8443
 EXPOSE 8888
diff --git a/openvidu-server/docker/openvidu-server/create_image.sh b/openvidu-server/docker/openvidu-server/create_image.sh
index c9a4057d..d6e3e456 100755
--- a/openvidu-server/docker/openvidu-server/create_image.sh
+++ b/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
\ No newline at end of file
diff --git a/openvidu-server/docker/openvidu-server/supervisord.conf b/openvidu-server/docker/openvidu-server/supervisord.conf
index 37dbf9fe..97012361 100644
--- a/openvidu-server/docker/openvidu-server/supervisord.conf
+++ b/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 /openvidu-server.jar"
+command=/bin/bash -c "java -jar /openvidu-server-cbx.jar"
 redirect_stderr=true

From b5a96d3726045fa3f911a7139341392de11e9ec3 Mon Sep 17 00:00:00 2001
From: miguelrcDEV <miguel.rodriguez@cocodin.com>
Date: Wed, 7 Feb 2018 17:08:34 +0100
Subject: [PATCH 2/3] Recording set

---
 .../main/resources/application-ngrok.properties  |   2 +-
 .../src/main/resources/application.properties    |  12 ++++++------
 openvidu-server/src/main/resources/cbx_cert.jks  | Bin 0 -> 3780 bytes
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 openvidu-server/src/main/resources/cbx_cert.jks

diff --git a/openvidu-server/src/main/resources/application-ngrok.properties b/openvidu-server/src/main/resources/application-ngrok.properties
index 1848760d..619d0374 100644
--- a/openvidu-server/src/main/resources/application-ngrok.properties
+++ b/openvidu-server/src/main/resources/application-ngrok.properties
@@ -6,5 +6,5 @@ server.address: 0.0.0.0
 
 kms.uris=[\"ws://localhost:8888/kurento\"]
 
-openvidu.secret: MY_SECRET
+openvidu.secret: YOUR_SECRET
 openvidu.publicurl: ngrok
\ No newline at end of file
diff --git a/openvidu-server/src/main/resources/application.properties b/openvidu-server/src/main/resources/application.properties
index 15e57dab..e06e9b2c 100644
--- a/openvidu-server/src/main/resources/application.properties
+++ b/openvidu-server/src/main/resources/application.properties
@@ -1,15 +1,15 @@
 server.port: 8443
 server.address: 0.0.0.0
 server.ssl.enabled: true
-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
\ No newline at end of file
diff --git a/openvidu-server/src/main/resources/cbx_cert.jks b/openvidu-server/src/main/resources/cbx_cert.jks
new file mode 100644
index 0000000000000000000000000000000000000000..98933488957b173230934a73df1dcb7a35286eba
GIT binary patch
literal 3780
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
Jodj>7{R;-1+8Y1>

literal 0
HcmV?d00001


From 4d5d289b6041f4a4a70f84ec73a3ba7c35e3c250 Mon Sep 17 00:00:00 2001
From: miguelrcDEV <miguel.rodriguez@cocodin.com>
Date: Thu, 8 Feb 2018 17:48:25 +0100
Subject: [PATCH 3/3] Docker image sh script

---
 .../main/resources/councilbox_server_kms_docker.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 openvidu-server/src/main/resources/councilbox_server_kms_docker.sh

diff --git a/openvidu-server/src/main/resources/councilbox_server_kms_docker.sh b/openvidu-server/src/main/resources/councilbox_server_kms_docker.sh
new file mode 100644
index 00000000..5587fbd0
--- /dev/null
+++ b/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
\ No newline at end of file