From 9f3b701b07f6efc275068b3b7721c31667b4e43b Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Thu, 31 Aug 2017 17:03:33 +0200 Subject: [PATCH] 'openvidu.security' property removed --- README.md | 6 +++--- ngrok-deploy-plainjs.sh | 18 ------------------ openvidu-java-client/create-jar-package.sh | 3 --- openvidu-server/src/angular/BuildFrontJar.sh | 5 +++++ .../src/angular/BuildFrontJarAndRun.sh | 4 ++-- .../src/main/resources/application.properties | 1 - update-plainjs-prod.sh | 7 +------ update-plainjs.sh | 7 +------ 8 files changed, 12 insertions(+), 39 deletions(-) delete mode 100755 ngrok-deploy-plainjs.sh delete mode 100755 openvidu-java-client/create-jar-package.sh create mode 100755 openvidu-server/src/angular/BuildFrontJar.sh diff --git a/README.md b/README.md index 845f1b6e..f12034ef 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ We have implemented a very basic demo application to see OpenVidu in action. To - Run this Docker container ``` - docker run -p 5000:5000 -p 4040:4040 -e KMS_STUN_IP=193.147.51.12 -e KMS_STUN_PORT=3478 -e openvidu.security=false openvidu/openvidu-plainjs-demo + docker run -p 5000:5000 -p 4040:4040 -e KMS_STUN_IP=193.147.51.12 -e KMS_STUN_PORT=3478 openvidu/openvidu-plainjs-demo ``` - Wait until you see a public URL ended with `.ngrok.io`. You can connect locally in [`localhost:5000`](http://localhost:5000) or by using the ngrok public URL. You can also share this URL with anyone you want to test the app over the Internet! @@ -51,7 +51,7 @@ Building a simple app with OpenVidu OpenVidu has a traditional **Client - Server** architecture built on three modules that are shown in the image above. To run **openvidu-server** and **Kurento Media Server** you can execute the following container: ``` -docker run -p 8443:8443 --rm -e KMS_STUN_IP=193.147.51.12 -e KMS_STUN_PORT=3478 -e openvidu.security=false openvidu/openvidu-server-kms +docker run -p 8443:8443 --rm -e KMS_STUN_IP=193.147.51.12 -e KMS_STUN_PORT=3478 openvidu/openvidu-server-kms ``` @@ -486,7 +486,7 @@ Here you have a step by step guide to deploy a production version of OpenVidu in 7. Init openvidu-server Docker container (securization enabled) ``` - sudo docker run -d -p 8443:8443 -e openvidu.security=true -e openvidu.secret=YOUR_SECRET -e kms.uris=[\"ws://YOUR_MACHINE'S_INTERNAL_IP:8888/kurento\"] openvidu/openvidu-server + sudo docker run -d -p 8443:8443 -e openvidu.secret=YOUR_SECRET -e kms.uris=[\"ws://YOUR_MACHINE'S_INTERNAL_IP:8888/kurento\"] openvidu/openvidu-server ``` diff --git a/ngrok-deploy-plainjs.sh b/ngrok-deploy-plainjs.sh deleted file mode 100755 index eabe5ff7..00000000 --- a/ngrok-deploy-plainjs.sh +++ /dev/null @@ -1,18 +0,0 @@ -cd openvidu-browser/src/main/resources - -npm run updatetsc -npm run browserify - -cd ../../../../ - -# openvidu-sample-basic-plainjs -cp openvidu-browser/src/main/resources/static/js/OpenVidu.js ../openvidu-tutorials/openvidu-insecure-js/web/OpenVidu.js - -cd ../openvidu-docker/openvidu-plainjs-demo -./create_image.sh - -docker rm $(docker ps -q -f status=exited) -docker rmi $(docker images -q -f dangling=true) - -docker run -p 5000:5000 -p 4040:4040 -e KMS_STUN_IP=193.147.51.12 -e KMS_STUN_PORT=3478 -e openvidu.security=false openvidu/openvidu-plainjs-demo - diff --git a/openvidu-java-client/create-jar-package.sh b/openvidu-java-client/create-jar-package.sh deleted file mode 100755 index fa055a0a..00000000 --- a/openvidu-java-client/create-jar-package.sh +++ /dev/null @@ -1,3 +0,0 @@ -mvn clean compile package - -cp target/openvidu-backend-client-1.0.0-beta.1.jar target/openvidu-backend-client.jar diff --git a/openvidu-server/src/angular/BuildFrontJar.sh b/openvidu-server/src/angular/BuildFrontJar.sh new file mode 100755 index 00000000..af442fbc --- /dev/null +++ b/openvidu-server/src/angular/BuildFrontJar.sh @@ -0,0 +1,5 @@ +#!/bin/sh +cd frontend +ng build --output-path ../../main/resources/static +cd ../../../ +mvn -DskipTests=true clean compile package diff --git a/openvidu-server/src/angular/BuildFrontJarAndRun.sh b/openvidu-server/src/angular/BuildFrontJarAndRun.sh index c025f75d..94c66cd2 100755 --- a/openvidu-server/src/angular/BuildFrontJarAndRun.sh +++ b/openvidu-server/src/angular/BuildFrontJarAndRun.sh @@ -2,5 +2,5 @@ cd frontend ng build --output-path ../../main/resources/static cd ../../../ -mvn -DskipTests=true clean package -mvn -Dopenvidu.security=$1 exec:java +mvn -DskipTests=true clean compile package +mvn exec:java diff --git a/openvidu-testapp/src/main/resources/application.properties b/openvidu-testapp/src/main/resources/application.properties index 744f43c1..8ecb26df 100644 --- a/openvidu-testapp/src/main/resources/application.properties +++ b/openvidu-testapp/src/main/resources/application.properties @@ -7,5 +7,4 @@ server.ssl.keyAlias: kurento-selfsigned kms.uris=[\"ws://localhost:8888/kurento\"] openvidu.secret: MY_SECRET -openvidu.security: false openvidu.publicurl: local \ No newline at end of file diff --git a/update-plainjs-prod.sh b/update-plainjs-prod.sh index a0231cfc..41df241e 100755 --- a/update-plainjs-prod.sh +++ b/update-plainjs-prod.sh @@ -1,9 +1,4 @@ -cd openvidu-browser/src/main/resources - -npm run updatetsc -VERSION="$1" npm run browserify-prod - -cd ../../../../ +VERSION="$1" # openvidu-insecure-js cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-insecure-js/web/openvidu-browser-"$1".min.js diff --git a/update-plainjs.sh b/update-plainjs.sh index ba48a089..05009b3a 100755 --- a/update-plainjs.sh +++ b/update-plainjs.sh @@ -1,9 +1,4 @@ -cd openvidu-browser/src/main/resources - -npm run updatetsc -VERSION="$1" npm run browserify - -cd ../../../../ +VERSION="$1" # openvidu-insecure-js cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-insecure-js/web/openvidu-browser-"$1".js