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

Fix spelling of several words in user-facing text & logs 

stoped -> stopped
stoping -> stopping
uppgrade -> upgrade
dowloading -> downloading
ouput -> output
lastest -> latest
Openvidu -> OpenVidu
pull/621/head
Juan Navarro 2021-04-20 16:36:33 +02:00
parent 83a341767e
commit 050057253a
17 changed files with 133 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template
View File

@ -302,14 +302,14 @@ Resources:
export HOME="/root" export HOME="/root"
# Replace .env variables # Replace .env variables
/usr/local/bin/feedGroupVars.sh || { echo "[Openvidu] Parameters incorrect/insufficient"; exit 1; } /usr/local/bin/feedGroupVars.sh || { echo "[OpenVidu] Parameters incorrect/insufficient"; exit 1; }
# Launch on reboot # Launch on reboot
echo "@reboot /usr/local/bin/restartCE.sh" | crontab echo "@reboot /usr/local/bin/restartCE.sh" | crontab
# Download certs if "WichCert" mode # Download certs if "WichCert" mode
if [ "${WhichCert}" == "owncert" ]; then if [ "${WhichCert}" == "owncert" ]; then
/usr/local/bin/buildCerts.sh || { echo "[Openvidu] error with the certificate files"; exit 1; } /usr/local/bin/buildCerts.sh || { echo "[OpenVidu] error with the certificate files"; exit 1; }
fi fi
# Start openvidu application # Start openvidu application
@ -331,7 +331,7 @@ Resources:
/usr/local/bin/check_app_ready.sh /usr/local/bin/check_app_ready.sh
# Start up the cfn-hup daemon to listen for changes to the Web Server metadata # Start up the cfn-hup daemon to listen for changes to the Web Server metadata
/usr/local/bin/cfn-hup -v || { echo "[Openvidu] Failed to start cfn-hup"; exit 1; } /usr/local/bin/cfn-hup -v || { echo "[OpenVidu] Failed to start cfn-hup"; exit 1; }
# sending the finish call # sending the finish call
/usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region} /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region}

8
openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template
View File

@ -94,7 +94,7 @@ Resources:
# Openvidu recording # Openvidu recording
docker pull openvidu/openvidu-recording:OPENVIDU_RECORDING_DOCKER_TAG docker pull openvidu/openvidu-recording:OPENVIDU_RECORDING_DOCKER_TAG
# Openvidu CE images # OpenVidu CE images
cd /opt/openvidu cd /opt/openvidu
docker-compose pull docker-compose pull
mode: "000755" mode: "000755"
@ -119,11 +119,11 @@ Resources:
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerCE cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerCE
/usr/local/bin/installDockerAndDockerCompose.sh || { echo "[Openvidu] error installing docker and compose"; exit 1; } /usr/local/bin/installDockerAndDockerCompose.sh || { echo "[OpenVidu] error installing docker and compose"; exit 1; }
/usr/local/bin/installOpenviduCE.sh || { echo "[Openvidu] error installing Openvidu CE"; exit 1; } /usr/local/bin/installOpenviduCE.sh || { echo "[OpenVidu] error installing OpenVidu CE"; exit 1; }
/usr/local/bin/getDockerImages.sh || { echo "[Openvidu] error getting docker images"; exit 1; } /usr/local/bin/getDockerImages.sh || { echo "[OpenVidu] error getting docker images"; exit 1; }
# sending the finish call # sending the finish call
/usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region} /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region}

16
openvidu-server/deployments/ce/docker-compose/install_openvidu.sh
View File

@ -16,7 +16,7 @@ fatal_error() {
new_ov_installation() { new_ov_installation() {
printf '\n' printf '\n'
printf '\n =======================================' printf '\n ======================================='
printf '\n Install Openvidu CE %s' "${OPENVIDU_VERSION}" printf '\n Install OpenVidu CE %s' "${OPENVIDU_VERSION}"
printf '\n =======================================' printf '\n ======================================='
printf '\n' printf '\n'
@ -25,7 +25,7 @@ new_ov_installation() {
mkdir "${OPENVIDU_FOLDER}" || fatal_error "Error while creating the folder '${OPENVIDU_FOLDER}'" mkdir "${OPENVIDU_FOLDER}" || fatal_error "Error while creating the folder '${OPENVIDU_FOLDER}'"
# Download necessary files # Download necessary files
printf '\n => Downloading Openvidu CE files:' printf '\n => Downloading OpenVidu CE files:'
curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/ce/docker-compose/.env \ curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/ce/docker-compose/.env \
--output "${OPENVIDU_FOLDER}/.env" || fatal_error "Error when downloading the file '.env'" --output "${OPENVIDU_FOLDER}/.env" || fatal_error "Error when downloading the file '.env'"
@ -104,7 +104,7 @@ upgrade_ov() {
[ -z "${OPENVIDU_PREVIOUS_FOLDER}" ] && fatal_error "No previous Openvidu installation found" [ -z "${OPENVIDU_PREVIOUS_FOLDER}" ] && fatal_error "No previous Openvidu installation found"
# Uppgrade Openvidu # Upgrade Openvidu
OPENVIDU_PREVIOUS_VERSION=$(grep 'Openvidu Version:' "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.yml" | awk '{ print $4 }') OPENVIDU_PREVIOUS_VERSION=$(grep 'Openvidu Version:' "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.yml" | awk '{ print $4 }')
[ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version" [ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version"
@ -116,7 +116,7 @@ upgrade_ov() {
printf '\n' printf '\n'
printf '\n =======================================' printf '\n ======================================='
printf '\n Upgrade Openvidu CE %s to %s' "${OPENVIDU_PREVIOUS_VERSION}" "${OPENVIDU_VERSION}" printf '\n Upgrade OpenVidu CE %s to %s' "${OPENVIDU_PREVIOUS_VERSION}" "${OPENVIDU_VERSION}"
printf '\n =======================================' printf '\n ======================================='
printf '\n' printf '\n'
@ -132,7 +132,7 @@ upgrade_ov() {
mkdir "${TMP_FOLDER}" || fatal_error "Error while creating the folder 'temporal'" mkdir "${TMP_FOLDER}" || fatal_error "Error while creating the folder 'temporal'"
# Download necessary files # Download necessary files
printf '\n => Downloading new Openvidu CE files:' printf '\n => Downloading new OpenVidu CE files:'
curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/ce/docker-compose/docker-compose.yml \ curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/ce/docker-compose/docker-compose.yml \
--output "${TMP_FOLDER}/docker-compose.yml" || fatal_error "Error when downloading the file 'docker-compose.yml'" --output "${TMP_FOLDER}/docker-compose.yml" || fatal_error "Error when downloading the file 'docker-compose.yml'"
@ -150,8 +150,8 @@ upgrade_ov() {
--output "${TMP_FOLDER}/openvidu" || fatal_error "Error when downloading the file 'openvidu'" --output "${TMP_FOLDER}/openvidu" || fatal_error "Error when downloading the file 'openvidu'"
printf '\n - openvidu' printf '\n - openvidu'
# Dowloading new images and stoped actual Openvidu # Downloading new images and stopped actual Openvidu
printf '\n => Dowloading new images...' printf '\n => Downloading new images...'
printf '\n' printf '\n'
sleep 1 sleep 1
@ -160,7 +160,7 @@ upgrade_ov() {
cd "${TMP_FOLDER}" || fatal_error "Error when moving to 'tmp' folder" cd "${TMP_FOLDER}" || fatal_error "Error when moving to 'tmp' folder"
docker-compose pull | true docker-compose pull | true
printf '\n => Stoping Openvidu...' printf '\n => Stopping Openvidu...'
printf '\n' printf '\n'
sleep 1 sleep 1

16
openvidu-server/deployments/ce/docker-compose/openvidu
View File

@ -4,7 +4,7 @@ upgrade_ov() {
UPGRADE_SCRIPT_URL="https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_OVVERSION.sh" UPGRADE_SCRIPT_URL="https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_OVVERSION.sh"
HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${UPGRADE_SCRIPT_URL//OVVERSION/$1}) HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${UPGRADE_SCRIPT_URL//OVVERSION/$1})
printf " => Upgrading Openvidu CE to '%s' version" "$1" printf " => Upgrading OpenVidu CE to '%s' version" "$1"
if [ "$HTTP_STATUS" == "200" ]; then if [ "$HTTP_STATUS" == "200" ]; then
printf "\n => Downloading and upgrading new version" printf "\n => Downloading and upgrading new version"
@ -13,7 +13,7 @@ upgrade_ov() {
curl --silent ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade curl --silent ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade
else else
printf "\n =======¡ERROR!=======" printf "\n =======¡ERROR!======="
printf "\n Openvidu CE Version '%s' not exist" "$1" printf "\n OpenVidu CE Version '%s' not exist" "$1"
printf "\n" printf "\n"
exit 0 exit 0
fi fi
@ -71,7 +71,7 @@ generate_report() {
REPORT_CREATION_DATE=$(date +"%d-%m-%Y") REPORT_CREATION_DATE=$(date +"%d-%m-%Y")
REPORT_CREATION_TIME=$(date +"%H:%M:%S") REPORT_CREATION_TIME=$(date +"%H:%M:%S")
REPORT_NAME="openvidu-report-${REPORT_CREATION_DATE}-$(date +"%H-%M").txt" REPORT_NAME="openvidu-report-${REPORT_CREATION_DATE}-$(date +"%H-%M").txt"
REPORT_OUPUT="${OV_FOLDER}/${REPORT_NAME}" REPORT_OUTPUT="${OV_FOLDER}/${REPORT_NAME}"
{ {
printf "\n =======================================" printf "\n ======================================="
@ -186,10 +186,10 @@ generate_report() {
printf '\n' printf '\n'
done done
} >> "${REPORT_OUPUT}" 2>&1 } >> "${REPORT_OUTPUT}" 2>&1
printf "\n Generation of the report completed with success" printf "\n Generation of the report completed with success"
printf "\n You can get your report at path '%s'" "${REPORT_OUPUT}" printf "\n You can get your report at path '%s'" "${REPORT_OUTPUT}"
printf "\n" printf "\n"
} }
@ -198,10 +198,10 @@ usage() {
printf "\n\nAvailable Commands:" printf "\n\nAvailable Commands:"
printf "\n\tstart\t\t\tStart all services" printf "\n\tstart\t\t\tStart all services"
printf "\n\tstop\t\t\tStop all services" printf "\n\tstop\t\t\tStop all services"
printf "\n\trestart\t\t\tRestart all stoped and running services" printf "\n\trestart\t\t\tRestart all stopped and running services"
printf "\n\tlogs [-f]\t\tShow openvidu logs." printf "\n\tlogs [-f]\t\tShow openvidu logs."
printf "\n\tkms-logs [-f]\t\tShow kms logs" printf "\n\tkms-logs [-f]\t\tShow kms logs"
printf "\n\tupgrade\t\t\tUpgrade to the lastest Openvidu version" printf "\n\tupgrade\t\t\tUpgrade to the latest Openvidu version"
printf "\n\tupgrade [version]\tUpgrade to the specific Openvidu version" printf "\n\tupgrade [version]\tUpgrade to the specific Openvidu version"
printf "\n\tversion\t\t\tShow version of Openvidu Server" printf "\n\tversion\t\t\tShow version of Openvidu Server"
printf "\n\treport\t\t\tGenerate a report with the current status of Openvidu" printf "\n\treport\t\t\tGenerate a report with the current status of Openvidu"
@ -255,7 +255,7 @@ case $1 in
UPGRADE_VERSION="$2" UPGRADE_VERSION="$2"
fi fi
read -r -p " You're about to update Openvidu CE to '${UPGRADE_VERSION}' version. Are you sure? [y/N]: " response read -r -p " You're about to update OpenVidu CE to '${UPGRADE_VERSION}' version. Are you sure? [y/N]: " response
case "$response" in case "$response" in
[yY][eE][sS]|[yY]) [yY][eE][sS]|[yY])
upgrade_ov "${UPGRADE_VERSION}" upgrade_ov "${UPGRADE_VERSION}"

6
openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template
View File

@ -120,11 +120,11 @@ Resources:
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource KurentoMediaServer cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource KurentoMediaServer
/usr/local/bin/installDockerAndDockerCompose.sh || { echo "[Openvidu] error installing software"; exit 1; } /usr/local/bin/installDockerAndDockerCompose.sh || { echo "[OpenVidu] error installing software"; exit 1; }
/usr/local/bin/installMediaNode.sh || { echo "[Openvidu] error installing Media Node"; exit 1; } /usr/local/bin/installMediaNode.sh || { echo "[OpenVidu] error installing Media Node"; exit 1; }
/usr/local/bin/runMediaNode.sh || { echo "[Openvidu] error running Media Node"; exit 1; } /usr/local/bin/runMediaNode.sh || { echo "[OpenVidu] error running Media Node"; exit 1; }
# sending the finish call # sending the finish call
/usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region} /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region}

8
openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template
View File

@ -91,7 +91,7 @@ Resources:
# Openvidu recording # Openvidu recording
docker pull openvidu/openvidu-recording:OPENVIDU_RECORDING_DOCKER_TAG docker pull openvidu/openvidu-recording:OPENVIDU_RECORDING_DOCKER_TAG
# Openvidu PRO images # OpenVidu Pro images
cd /opt/openvidu cd /opt/openvidu
docker-compose pull docker-compose pull
mode: "000755" mode: "000755"
@ -122,11 +122,11 @@ Resources:
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerPro cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerPro
/usr/local/bin/installDockerAndDockerCompose.sh || { echo "[Openvidu] error installing docker and compose"; exit 1; } /usr/local/bin/installDockerAndDockerCompose.sh || { echo "[OpenVidu] error installing docker and compose"; exit 1; }
/usr/local/bin/installOpenviduServerPRO.sh || { echo "[Openvidu] error installing Openvidu Server PRO"; exit 1; } /usr/local/bin/installOpenviduServerPRO.sh || { echo "[OpenVidu] error installing Openvidu Server PRO"; exit 1; }
/usr/local/bin/getDockerImages.sh || { echo "[Openvidu] error getting docker images"; exit 1; } /usr/local/bin/getDockerImages.sh || { echo "[OpenVidu] error getting docker images"; exit 1; }
# sending the finish call # sending the finish call
/usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region} /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region}

14
openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template
View File

@ -1,6 +1,6 @@
--- ---
AWSTemplateFormatVersion: 2010-09-09 AWSTemplateFormatVersion: 2010-09-09
Description: Openvidu Pro CloudFormation template Description: OpenVidu Pro CloudFormation template
Parameters: Parameters:
@ -483,13 +483,13 @@ Resources:
echo $PublicHostname > /usr/share/openvidu/old-host-name echo $PublicHostname > /usr/share/openvidu/old-host-name
fi fi
# Openvidu Pro mode # OpenVidu Pro mode
sed -i "s/OPENVIDU_PRO_CLUSTER_MODE=manual/OPENVIDU_PRO_CLUSTER_MODE=auto/" $WORKINGDIR/.env sed -i "s/OPENVIDU_PRO_CLUSTER_MODE=manual/OPENVIDU_PRO_CLUSTER_MODE=auto/" $WORKINGDIR/.env
# Openvidu Pro Media Nodes # OpenVidu Pro Media Nodes
sed -i "s/#OPENVIDU_PRO_CLUSTER_MEDIA_NODES=/OPENVIDU_PRO_CLUSTER_MEDIA_NODES=${MediaNodesStartNumber}/" $WORKINGDIR/.env sed -i "s/#OPENVIDU_PRO_CLUSTER_MEDIA_NODES=/OPENVIDU_PRO_CLUSTER_MEDIA_NODES=${MediaNodesStartNumber}/" $WORKINGDIR/.env
# Openvidu Pro enviroment # OpenVidu Pro enviroment
sed -i "s/OPENVIDU_PRO_CLUSTER_ENVIRONMENT=on_premise/OPENVIDU_PRO_CLUSTER_ENVIRONMENT=aws/" $WORKINGDIR/.env sed -i "s/OPENVIDU_PRO_CLUSTER_ENVIRONMENT=on_premise/OPENVIDU_PRO_CLUSTER_ENVIRONMENT=aws/" $WORKINGDIR/.env
# Replace certificated type # Replace certificated type
@ -650,17 +650,17 @@ Resources:
export HOME="/root" export HOME="/root"
# Replace .env variables # Replace .env variables
/usr/local/bin/feedGroupVars.sh || { echo "[Openvidu] Parameters incorrect/insufficient"; exit 1; } /usr/local/bin/feedGroupVars.sh || { echo "[OpenVidu] Parameters incorrect/insufficient"; exit 1; }
# Create security groups # Create security groups
/usr/local/bin/create_security_group_rules.sh || { echo "[Openvidu] Error creating security groups"; exit 1; } /usr/local/bin/create_security_group_rules.sh || { echo "[OpenVidu] Error creating security groups"; exit 1; }
# Launch on reboot # Launch on reboot
echo "@reboot /usr/local/bin/restartPRO.sh" | crontab echo "@reboot /usr/local/bin/restartPRO.sh" | crontab
# Download certs if "WichCert" mode # Download certs if "WichCert" mode
if [ "${WhichCert}" == "owncert" ]; then if [ "${WhichCert}" == "owncert" ]; then
/usr/local/bin/buildCerts.sh || { echo "[Openvidu] error with the certificate files"; exit 1; } /usr/local/bin/buildCerts.sh || { echo "[OpenVidu] error with the certificate files"; exit 1; }
fi fi
# Start openvidu application # Start openvidu application

2
openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/.env
View File

@ -9,7 +9,7 @@
# For example: 198.51.100.1, or openvidu.example.com # For example: 198.51.100.1, or openvidu.example.com
DOMAIN_OR_PUBLIC_IP= DOMAIN_OR_PUBLIC_IP=
# OpenVidu PRO License # OpenVidu Pro License
OPENVIDU_PRO_LICENSE= OPENVIDU_PRO_LICENSE=
# OpenVidu SECRET used for apps to connect to OpenVidu server and users to access to OpenVidu Dashboard # OpenVidu SECRET used for apps to connect to OpenVidu server and users to access to OpenVidu Dashboard

18
openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/install_openvidu_pro.sh
View File

@ -19,7 +19,7 @@ fatal_error() {
new_ov_installation() { new_ov_installation() {
printf '\n' printf '\n'
printf '\n =======================================' printf '\n ======================================='
printf '\n Install Openvidu PRO %s' "${OPENVIDU_VERSION}" printf '\n Install OpenVidu Pro %s' "${OPENVIDU_VERSION}"
printf '\n =======================================' printf '\n ======================================='
printf '\n' printf '\n'
@ -43,7 +43,7 @@ new_ov_installation() {
chown 1000:1000 "${ELASTICSEARCH_FOLDER}" || fatal_error "Error while changing permission to 'elasticsearch' folder" chown 1000:1000 "${ELASTICSEARCH_FOLDER}" || fatal_error "Error while changing permission to 'elasticsearch' folder"
# Download necessary files # Download necessary files
printf '\n => Downloading Openvidu PRO files:' printf '\n => Downloading OpenVidu Pro files:'
curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh \ curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh \
--output "${AWS_SCRIPTS_FOLDER}/openvidu_autodiscover.sh" || fatal_error "Error when downloading the file 'openvidu_autodiscover.sh'" --output "${AWS_SCRIPTS_FOLDER}/openvidu_autodiscover.sh" || fatal_error "Error when downloading the file 'openvidu_autodiscover.sh'"
@ -108,7 +108,7 @@ new_ov_installation() {
printf '\n' printf '\n'
printf '\n' printf '\n'
printf '\n =======================================' printf '\n ======================================='
printf '\n Openvidu PRO successfully installed.' printf '\n OpenVidu Pro successfully installed.'
printf '\n =======================================' printf '\n ======================================='
printf '\n' printf '\n'
printf '\n 1. Go to openvidu folder:' printf '\n 1. Go to openvidu folder:'
@ -167,7 +167,7 @@ upgrade_ov() {
[ -z "${OPENVIDU_PREVIOUS_FOLDER}" ] && fatal_error "No previous Openvidu installation found" [ -z "${OPENVIDU_PREVIOUS_FOLDER}" ] && fatal_error "No previous Openvidu installation found"
# Uppgrade Openvidu # Upgrade Openvidu
OPENVIDU_PREVIOUS_VERSION=$(grep 'Openvidu Version:' "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.yml" | awk '{ print $4 }') OPENVIDU_PREVIOUS_VERSION=$(grep 'Openvidu Version:' "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.yml" | awk '{ print $4 }')
[ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version" [ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version"
@ -179,7 +179,7 @@ upgrade_ov() {
printf '\n' printf '\n'
printf '\n =======================================' printf '\n ======================================='
printf '\n Upgrade Openvidu PRO %s to %s' "${OPENVIDU_PREVIOUS_VERSION}" "${OPENVIDU_VERSION}" printf '\n Upgrade OpenVidu Pro %s to %s' "${OPENVIDU_PREVIOUS_VERSION}" "${OPENVIDU_VERSION}"
printf '\n =======================================' printf '\n ======================================='
printf '\n' printf '\n'
@ -195,7 +195,7 @@ upgrade_ov() {
mkdir "${TMP_FOLDER}" || fatal_error "Error while creating the folder 'temporal'" mkdir "${TMP_FOLDER}" || fatal_error "Error while creating the folder 'temporal'"
# Download necessary files # Download necessary files
printf '\n => Downloading new Openvidu PRO files:' printf '\n => Downloading new OpenVidu Pro files:'
curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh \ curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh \
--output "${TMP_FOLDER}/openvidu_autodiscover.sh" || fatal_error "Error when downloading the file 'openvidu_autodiscover.sh'" --output "${TMP_FOLDER}/openvidu_autodiscover.sh" || fatal_error "Error when downloading the file 'openvidu_autodiscover.sh'"
@ -233,8 +233,8 @@ upgrade_ov() {
--output "${TMP_FOLDER}/openvidu" || fatal_error "Error when downloading the file 'openvidu'" --output "${TMP_FOLDER}/openvidu" || fatal_error "Error when downloading the file 'openvidu'"
printf '\n - openvidu' printf '\n - openvidu'
# Dowloading new images and stoped actual Openvidu # Downloading new images and stopped actual Openvidu
printf '\n => Dowloading new images...' printf '\n => Downloading new images...'
printf '\n' printf '\n'
sleep 1 sleep 1
@ -244,7 +244,7 @@ upgrade_ov() {
printf '\n' printf '\n'
docker-compose pull | true docker-compose pull | true
printf '\n => Stoping Openvidu...' printf '\n => Stopping Openvidu...'
printf '\n' printf '\n'
sleep 1 sleep 1

16
openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/openvidu
View File

@ -4,7 +4,7 @@ upgrade_ov() {
UPGRADE_SCRIPT_URL="https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_pro_OVVERSION.sh" UPGRADE_SCRIPT_URL="https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_pro_OVVERSION.sh"
HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${UPGRADE_SCRIPT_URL//OVVERSION/$1}) HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${UPGRADE_SCRIPT_URL//OVVERSION/$1})
printf " => Upgrading Openvidu PRO to '%s' version" "$1" printf " => Upgrading OpenVidu Pro to '%s' version" "$1"
if [ "$HTTP_STATUS" == "200" ]; then if [ "$HTTP_STATUS" == "200" ]; then
printf "\n => Downloading and upgrading new version" printf "\n => Downloading and upgrading new version"
@ -13,7 +13,7 @@ upgrade_ov() {
curl --silent ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade curl --silent ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade
else else
printf "\n =======¡ERROR!=======" printf "\n =======¡ERROR!======="
printf "\n Openvidu PRO Version '%s' not exist" "$1" printf "\n OpenVidu Pro Version '%s' not exist" "$1"
printf "\n" printf "\n"
exit 0 exit 0
fi fi
@ -71,7 +71,7 @@ generate_report() {
REPORT_CREATION_DATE=$(date +"%d-%m-%Y") REPORT_CREATION_DATE=$(date +"%d-%m-%Y")
REPORT_CREATION_TIME=$(date +"%H:%M:%S") REPORT_CREATION_TIME=$(date +"%H:%M:%S")
REPORT_NAME="openvidu-report-${REPORT_CREATION_DATE}-$(date +"%H-%M").txt" REPORT_NAME="openvidu-report-${REPORT_CREATION_DATE}-$(date +"%H-%M").txt"
REPORT_OUPUT="${OV_FOLDER}/${REPORT_NAME}" REPORT_OUTPUT="${OV_FOLDER}/${REPORT_NAME}"
{ {
printf "\n =======================================" printf "\n ======================================="
@ -176,10 +176,10 @@ generate_report() {
printf '\n' printf '\n'
done done
} >> "${REPORT_OUPUT}" 2>&1 } >> "${REPORT_OUTPUT}" 2>&1
printf "\n Generation of the report completed with success" printf "\n Generation of the report completed with success"
printf "\n You can get your report at path '%s'" "${REPORT_OUPUT}" printf "\n You can get your report at path '%s'" "${REPORT_OUTPUT}"
printf "\n" printf "\n"
} }
@ -224,9 +224,9 @@ usage() {
printf "\n\nAvailable Commands:" printf "\n\nAvailable Commands:"
printf "\n\tstart\t\t\tStart all services" printf "\n\tstart\t\t\tStart all services"
printf "\n\tstop\t\t\tStop all services" printf "\n\tstop\t\t\tStop all services"
printf "\n\trestart\t\t\tRestart all stoped and running services" printf "\n\trestart\t\t\tRestart all stopped and running services"
printf "\n\tlogs\t\t\tShow openvidu-server logs" printf "\n\tlogs\t\t\tShow openvidu-server logs"
printf "\n\tupgrade\t\t\tUpgrade to the lastest Openvidu version" printf "\n\tupgrade\t\t\tUpgrade to the latest Openvidu version"
printf "\n\tupgrade [version]\tUpgrade to the specific Openvidu version" printf "\n\tupgrade [version]\tUpgrade to the specific Openvidu version"
printf "\n\tversion\t\t\tShow version of Openvidu Server" printf "\n\tversion\t\t\tShow version of Openvidu Server"
printf "\n\treport\t\t\tGenerate a report with the current status of Openvidu" printf "\n\treport\t\t\tGenerate a report with the current status of Openvidu"
@ -268,7 +268,7 @@ case $1 in
UPGRADE_VERSION="$2" UPGRADE_VERSION="$2"
fi fi
read -r -p " You're about to update Openvidu PRO to '${UPGRADE_VERSION}' version. Are you sure? [y/N]: " response read -r -p " You're about to update OpenVidu Pro to '${UPGRADE_VERSION}' version. Are you sure? [y/N]: " response
case "$response" in case "$response" in
[yY][eE][sS]|[yY]) [yY][eE][sS]|[yY])
upgrade_ov "${UPGRADE_VERSION}" upgrade_ov "${UPGRADE_VERSION}"

10
openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh
View File

@ -156,7 +156,7 @@ upgrade_media_node() {
[ -z "${MEDIA_NODE_PREVIOUS_FOLDER}" ] && fatal_error "No previous Media Node installation found" [ -z "${MEDIA_NODE_PREVIOUS_FOLDER}" ] && fatal_error "No previous Media Node installation found"
# Uppgrade Media Node # Upgrade Media Node
OPENVIDU_PREVIOUS_VERSION=$(grep 'Openvidu Version:' "${MEDIA_NODE_PREVIOUS_FOLDER}/docker-compose.yml" | awk '{ print $4 }') OPENVIDU_PREVIOUS_VERSION=$(grep 'Openvidu Version:' "${MEDIA_NODE_PREVIOUS_FOLDER}/docker-compose.yml" | awk '{ print $4 }')
[ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version" [ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version"
@ -205,8 +205,8 @@ upgrade_media_node() {
--output "${TMP_FOLDER}/copy_config_files.sh" || fatal_error "Error when downloading the file 'copy_config_files.sh'" --output "${TMP_FOLDER}/copy_config_files.sh" || fatal_error "Error when downloading the file 'copy_config_files.sh'"
printf '\n - copy_config_files.sh' printf '\n - copy_config_files.sh'
# Dowloading new images and stoped actual Media Node # Downloading new images and stopped actual Media Node
printf '\n => Dowloading new images...' printf '\n => Downloading new images...'
printf '\n' printf '\n'
sleep 1 sleep 1
@ -214,7 +214,7 @@ upgrade_media_node() {
printf '\n' printf '\n'
cd "${TMP_FOLDER}" || fatal_error "Error when moving to '${TMP_FOLDER}' folder" cd "${TMP_FOLDER}" || fatal_error "Error when moving to '${TMP_FOLDER}' folder"
printf '\n => Stoping Media Node containers...' printf '\n => Stopping Media Node containers...'
printf '\n' printf '\n'
sleep 1 sleep 1
@ -232,7 +232,7 @@ upgrade_media_node() {
docker pull $OPENVIDU_RECORDING_IMAGE || fatal "Error while pulling docker image: $OPENVIDU_RECORDING_IMAGE" docker pull $OPENVIDU_RECORDING_IMAGE || fatal "Error while pulling docker image: $OPENVIDU_RECORDING_IMAGE"
docker-compose pull | true docker-compose pull | true
printf '\n => Stoping Media Node...' printf '\n => Stopping Media Node...'
printf '\n' printf '\n'
sleep 1 sleep 1

8
openvidu-server/deployments/pro/docker-compose/media-node/media_node
View File

@ -99,7 +99,7 @@ generate_report() {
REPORT_CREATION_DATE=$(date +"%d-%m-%Y") REPORT_CREATION_DATE=$(date +"%d-%m-%Y")
REPORT_CREATION_TIME=$(date +"%H:%M:%S") REPORT_CREATION_TIME=$(date +"%H:%M:%S")
REPORT_NAME="media-node-report-${REPORT_CREATION_DATE}-$(date +"%H-%M").txt" REPORT_NAME="media-node-report-${REPORT_CREATION_DATE}-$(date +"%H-%M").txt"
REPORT_OUPUT="${MEDIA_NODE_FOLDER}/${REPORT_NAME}" REPORT_OUTPUT="${MEDIA_NODE_FOLDER}/${REPORT_NAME}"
CONTAINERS=$(docker ps | awk '{if(NR>1) print $NF}') CONTAINERS=$(docker ps | awk '{if(NR>1) print $NF}')
{ {
@ -203,10 +203,10 @@ generate_report() {
printf '\n' printf '\n'
done done
} >> "${REPORT_OUPUT}" 2>&1 } >> "${REPORT_OUTPUT}" 2>&1
printf "\n Generation of the report completed with success" printf "\n Generation of the report completed with success"
printf "\n You can get your report at path '%s'" "${REPORT_OUPUT}" printf "\n You can get your report at path '%s'" "${REPORT_OUTPUT}"
printf "\n" printf "\n"
} }
@ -218,7 +218,7 @@ usage() {
printf "\n\trestart\t\t\tRestart media node service" printf "\n\trestart\t\t\tRestart media node service"
printf "\n\tlogs [-f]\t\tShow media-node-controller logs." printf "\n\tlogs [-f]\t\tShow media-node-controller logs."
printf "\n\tkms-logs [-f]\t\tShow kms logs" printf "\n\tkms-logs [-f]\t\tShow kms logs"
printf "\n\tupgrade\t\t\tUpgrade to the lastest Media Node version" printf "\n\tupgrade\t\t\tUpgrade to the latest Media Node version"
printf "\n\tupgrade [version]\tUpgrade to the specific Media Node version" printf "\n\tupgrade [version]\tUpgrade to the specific Media Node version"
printf "\n\tversion\t\t\tShow version of Media Node" printf "\n\tversion\t\t\tShow version of Media Node"
printf "\n\treport\t\t\tGenerate a report with the current status of Media Node" printf "\n\treport\t\t\tGenerate a report with the current status of Media Node"

2
openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env
View File

@ -9,7 +9,7 @@
# For example: 198.51.100.1, or openvidu.example.com # For example: 198.51.100.1, or openvidu.example.com
DOMAIN_OR_PUBLIC_IP= DOMAIN_OR_PUBLIC_IP=
# OpenVidu PRO License # OpenVidu Pro License
OPENVIDU_PRO_LICENSE= OPENVIDU_PRO_LICENSE=
# OpenVidu SECRET used for apps to connect to OpenVidu server and users to access to OpenVidu Dashboard # OpenVidu SECRET used for apps to connect to OpenVidu server and users to access to OpenVidu Dashboard

18
openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh
View File

@ -19,7 +19,7 @@ fatal_error() {
new_ov_installation() { new_ov_installation() {
printf '\n' printf '\n'
printf '\n =======================================' printf '\n ======================================='
printf '\n Install Openvidu PRO %s' "${OPENVIDU_VERSION}" printf '\n Install OpenVidu Pro %s' "${OPENVIDU_VERSION}"
printf '\n =======================================' printf '\n ======================================='
printf '\n' printf '\n'
@ -43,7 +43,7 @@ new_ov_installation() {
chown 1000:1000 "${ELASTICSEARCH_FOLDER}" || fatal_error "Error while changing permission to 'elasticsearch' folder" chown 1000:1000 "${ELASTICSEARCH_FOLDER}" || fatal_error "Error while changing permission to 'elasticsearch' folder"
# Download necessary files # Download necessary files
printf '\n => Downloading Openvidu PRO files:' printf '\n => Downloading OpenVidu Pro files:'
curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh \ curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh \
--output "${AWS_SCRIPTS_FOLDER}/openvidu_autodiscover.sh" || fatal_error "Error when downloading the file 'openvidu_autodiscover.sh'" --output "${AWS_SCRIPTS_FOLDER}/openvidu_autodiscover.sh" || fatal_error "Error when downloading the file 'openvidu_autodiscover.sh'"
@ -108,7 +108,7 @@ new_ov_installation() {
printf '\n' printf '\n'
printf '\n' printf '\n'
printf '\n =======================================' printf '\n ======================================='
printf '\n Openvidu PRO successfully installed.' printf '\n OpenVidu Pro successfully installed.'
printf '\n =======================================' printf '\n ======================================='
printf '\n' printf '\n'
printf '\n 1. Go to openvidu folder:' printf '\n 1. Go to openvidu folder:'
@ -167,7 +167,7 @@ upgrade_ov() {
[ -z "${OPENVIDU_PREVIOUS_FOLDER}" ] && fatal_error "No previous Openvidu installation found" [ -z "${OPENVIDU_PREVIOUS_FOLDER}" ] && fatal_error "No previous Openvidu installation found"
# Uppgrade Openvidu # Upgrade Openvidu
OPENVIDU_PREVIOUS_VERSION=$(grep 'Openvidu Version:' "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.yml" | awk '{ print $4 }') OPENVIDU_PREVIOUS_VERSION=$(grep 'Openvidu Version:' "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.yml" | awk '{ print $4 }')
[ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version" [ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version"
@ -179,7 +179,7 @@ upgrade_ov() {
printf '\n' printf '\n'
printf '\n =======================================' printf '\n ======================================='
printf '\n Upgrade Openvidu PRO %s to %s' "${OPENVIDU_PREVIOUS_VERSION}" "${OPENVIDU_VERSION}" printf '\n Upgrade OpenVidu Pro %s to %s' "${OPENVIDU_PREVIOUS_VERSION}" "${OPENVIDU_VERSION}"
printf '\n =======================================' printf '\n ======================================='
printf '\n' printf '\n'
@ -195,7 +195,7 @@ upgrade_ov() {
mkdir "${TMP_FOLDER}" || fatal_error "Error while creating the folder 'temporal'" mkdir "${TMP_FOLDER}" || fatal_error "Error while creating the folder 'temporal'"
# Download necessary files # Download necessary files
printf '\n => Downloading new Openvidu PRO files:' printf '\n => Downloading new OpenVidu Pro files:'
curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh \ curl --silent ${DOWNLOAD_URL}/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh \
--output "${TMP_FOLDER}/openvidu_autodiscover.sh" || fatal_error "Error when downloading the file 'openvidu_autodiscover.sh'" --output "${TMP_FOLDER}/openvidu_autodiscover.sh" || fatal_error "Error when downloading the file 'openvidu_autodiscover.sh'"
@ -233,8 +233,8 @@ upgrade_ov() {
--output "${TMP_FOLDER}/openvidu" || fatal_error "Error when downloading the file 'openvidu'" --output "${TMP_FOLDER}/openvidu" || fatal_error "Error when downloading the file 'openvidu'"
printf '\n - openvidu' printf '\n - openvidu'
# Dowloading new images and stoped actual Openvidu # Downloading new images and stopped actual Openvidu
printf '\n => Dowloading new images...' printf '\n => Downloading new images...'
printf '\n' printf '\n'
sleep 1 sleep 1
@ -244,7 +244,7 @@ upgrade_ov() {
printf '\n' printf '\n'
docker-compose pull | true docker-compose pull | true
printf '\n => Stoping Openvidu...' printf '\n => Stopping Openvidu...'
printf '\n' printf '\n'
sleep 1 sleep 1

16
openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu
View File

@ -4,7 +4,7 @@ upgrade_ov() {
UPGRADE_SCRIPT_URL="https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_pro_OVVERSION.sh" UPGRADE_SCRIPT_URL="https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_pro_OVVERSION.sh"
HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${UPGRADE_SCRIPT_URL//OVVERSION/$1}) HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${UPGRADE_SCRIPT_URL//OVVERSION/$1})
printf " => Upgrading Openvidu PRO to '%s' version" "$1" printf " => Upgrading OpenVidu Pro to '%s' version" "$1"
if [ "$HTTP_STATUS" == "200" ]; then if [ "$HTTP_STATUS" == "200" ]; then
printf "\n => Downloading and upgrading new version" printf "\n => Downloading and upgrading new version"
@ -13,7 +13,7 @@ upgrade_ov() {
curl --silent ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade curl --silent ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade
else else
printf "\n =======¡ERROR!=======" printf "\n =======¡ERROR!======="
printf "\n Openvidu PRO Version '%s' not exist" "$1" printf "\n OpenVidu Pro Version '%s' not exist" "$1"
printf "\n" printf "\n"
exit 0 exit 0
fi fi
@ -71,7 +71,7 @@ generate_report() {
REPORT_CREATION_DATE=$(date +"%d-%m-%Y") REPORT_CREATION_DATE=$(date +"%d-%m-%Y")
REPORT_CREATION_TIME=$(date +"%H:%M:%S") REPORT_CREATION_TIME=$(date +"%H:%M:%S")
REPORT_NAME="openvidu-report-${REPORT_CREATION_DATE}-$(date +"%H-%M").txt" REPORT_NAME="openvidu-report-${REPORT_CREATION_DATE}-$(date +"%H-%M").txt"
REPORT_OUPUT="${OV_FOLDER}/${REPORT_NAME}" REPORT_OUTPUT="${OV_FOLDER}/${REPORT_NAME}"
{ {
printf "\n =======================================" printf "\n ======================================="
@ -176,10 +176,10 @@ generate_report() {
printf '\n' printf '\n'
done done
} >> "${REPORT_OUPUT}" 2>&1 } >> "${REPORT_OUTPUT}" 2>&1
printf "\n Generation of the report completed with success" printf "\n Generation of the report completed with success"
printf "\n You can get your report at path '%s'" "${REPORT_OUPUT}" printf "\n You can get your report at path '%s'" "${REPORT_OUTPUT}"
printf "\n" printf "\n"
} }
@ -224,9 +224,9 @@ usage() {
printf "\n\nAvailable Commands:" printf "\n\nAvailable Commands:"
printf "\n\tstart\t\t\tStart all services" printf "\n\tstart\t\t\tStart all services"
printf "\n\tstop\t\t\tStop all services" printf "\n\tstop\t\t\tStop all services"
printf "\n\trestart\t\t\tRestart all stoped and running services" printf "\n\trestart\t\t\tRestart all stopped and running services"
printf "\n\tlogs\t\t\tShow openvidu-server logs" printf "\n\tlogs\t\t\tShow openvidu-server logs"
printf "\n\tupgrade\t\t\tUpgrade to the lastest Openvidu version" printf "\n\tupgrade\t\t\tUpgrade to the latest Openvidu version"
printf "\n\tupgrade [version]\tUpgrade to the specific Openvidu version" printf "\n\tupgrade [version]\tUpgrade to the specific Openvidu version"
printf "\n\tversion\t\t\tShow version of Openvidu Server" printf "\n\tversion\t\t\tShow version of Openvidu Server"
printf "\n\treport\t\t\tGenerate a report with the current status of Openvidu" printf "\n\treport\t\t\tGenerate a report with the current status of Openvidu"
@ -268,7 +268,7 @@ case $1 in
UPGRADE_VERSION="$2" UPGRADE_VERSION="$2"
fi fi
read -r -p " You're about to update Openvidu PRO to '${UPGRADE_VERSION}' version. Are you sure? [y/N]: " response read -r -p " You're about to update OpenVidu Pro to '${UPGRADE_VERSION}' version. Are you sure? [y/N]: " response
case "$response" in case "$response" in
[yY][eE][sS]|[yY]) [yY][eE][sS]|[yY])
upgrade_ov "${UPGRADE_VERSION}" upgrade_ov "${UPGRADE_VERSION}"

2
openvidu-server/docker/openvidu-server-pro/entrypoint.sh
View File

@ -16,7 +16,7 @@ if [ ! -z "${WAIT_KIBANA_URL}" ]; then
printf "\n ==== Kibana is Ready ====" printf "\n ==== Kibana is Ready ===="
fi fi
# Launch Openvidu Pro # Launch OpenVidu Pro
printf "\n" printf "\n"
printf "\n =======================================" printf "\n ======================================="
printf "\n = LAUNCH OPENVIDU-SERVER =" printf "\n = LAUNCH OPENVIDU-SERVER ="

2
openvidu-server/src/main/java/io/openvidu/server/resources/FrontendResourceHandler.java
View File

@ -29,7 +29,7 @@ import io.openvidu.server.config.OpenviduConfig;
* /NEW_FRONTEND_PATH. Entrypoint file index.html must have tag * /NEW_FRONTEND_PATH. Entrypoint file index.html must have tag
* <base href="/NEW_FRONTEND_PATH/"> * <base href="/NEW_FRONTEND_PATH/">
* *
* By default in OpenVidu CE this path is /dashboard and in OpenVidu PRO is * By default in OpenVidu CE this path is /dashboard and in OpenVidu Pro is
* /inspector * /inspector
* *
* @author Pablo Fuente (pablofuenteperez@gmail.com) * @author Pablo Fuente (pablofuenteperez@gmail.com)