ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: application.properties comply with deafult config values

pull/457/head
pabloFuente 2020-05-03 14:26:34 +02:00
parent c2ca2181fa
commit 1eb2d4ffe5
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-server/src/main/resources/application-container.properties
View File

@ -1 +1,3 @@
DOMAIN_OR_PUBLIC_IP=localhost
OPENVIDU_SECRET=MY_SECRET
HTTPS_PORT=4443 HTTPS_PORT=4443

10
openvidu-server/src/main/resources/application.properties
View File

@ -9,12 +9,12 @@ logging.level.root=info
spring.main.allow-bean-definition-overriding=true spring.main.allow-bean-definition-overriding=true
DOTENV_PATH=. DOTENV_PATH=.
DOMAIN_OR_PUBLIC_IP=localhost
HTTPS_PORT=443
CERTIFICATE_TYPE=selfsigned
KMS_URIS=["ws://localhost:8888/kurento"]
OPENVIDU_SECRET=MY_SECRET DOMAIN_OR_PUBLIC_IP=
OPENVIDU_SECRET=
CERTIFICATE_TYPE=selfsigned
HTTPS_PORT=443
KMS_URIS=["ws://localhost:8888/kurento"]
OPENVIDU_CDR=false OPENVIDU_CDR=false
OPENVIDU_CDR_PATH=/opt/openvidu/cdr OPENVIDU_CDR_PATH=/opt/openvidu/cdr

4
openvidu-test-e2e/jenkins/Jenkinsfile vendored
View File

@ -70,10 +70,10 @@ node('container') {
sh(script: '''#!/bin/bash sh(script: '''#!/bin/bash
if [ "$DOCKER_RECORDING_VERSION" != "default" ]; then if [ "$DOCKER_RECORDING_VERSION" != "default" ]; then
echo "Using custom openvidu-recording tag: $DOCKER_RECORDING_VERSION" echo "Using custom openvidu-recording tag: $DOCKER_RECORDING_VERSION"
cd openvidu/openvidu-server/target && java -jar -DDOMAIN_OR_PUBLIC_IP=172.17.0.1 -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true -DOPENVIDU_RECORDING_VERSION=$DOCKER_RECORDING_VERSION -DOPENVIDU_WEBHOOK=true -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook openvidu-server-*.jar &> openvidu-server.log & cd openvidu/openvidu-server/target && java -jar -DDOMAIN_OR_PUBLIC_IP=172.17.0.1 -DOPENVIDU_SECRET=MY_SECRET -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true -DOPENVIDU_RECORDING_VERSION=$DOCKER_RECORDING_VERSION -DOPENVIDU_WEBHOOK=true -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook openvidu-server-*.jar &> openvidu-server.log &
else else
echo "Using default openvidu-recording tag" echo "Using default openvidu-recording tag"
cd openvidu/openvidu-server/target && java -jar -DDOMAIN_OR_PUBLIC_IP=172.17.0.1 -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true -DOPENVIDU_WEBHOOK=true -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook openvidu-server-*.jar &> openvidu-server.log & cd openvidu/openvidu-server/target && java -jar -DDOMAIN_OR_PUBLIC_IP=172.17.0.1 -DOPENVIDU_SECRET=MY_SECRET -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true -DOPENVIDU_WEBHOOK=true -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook openvidu-server-*.jar &> openvidu-server.log &
fi fi
'''.stripIndent()) '''.stripIndent())
sh 'until $(curl --insecure --output /dev/null --silent --head --fail https://OPENVIDUAPP:MY_SECRET@localhost:4443/); do echo "Waiting for openvidu-server..."; sleep 2; done' sh 'until $(curl --insecure --output /dev/null --silent --head --fail https://OPENVIDUAPP:MY_SECRET@localhost:4443/); do echo "Waiting for openvidu-server..."; sleep 2; done'