diff --git a/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template b/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template index cb8b158e..ef24e1a6 100644 --- a/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template +++ b/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template @@ -100,7 +100,7 @@ Parameters: # Other configuration WantToDeployDemos: - Description: "Choose if you want to deploy OpenVidu Call application alongside OpenVidu platform." + Description: "Choose if you want to deploy OpenVidu Call application alongside OpenVidu platform." Type: String AllowedValues: - true @@ -180,7 +180,7 @@ Metadata: Conditions: WhichCertPresent: !Not [ !Equals [!Ref WhichCert, ""] ] PublicElasticIPPresent: !Not [ !Equals [!Ref PublicElasticIP, ""] ] - + Resources: OpenviduServer: @@ -224,7 +224,7 @@ Resources: content: !Sub | #!/bin/bash -x WORKINGDIR=/opt/openvidu - + # Replace secret sed -i "s/OPENVIDU_SECRET=/OPENVIDU_SECRET=${OpenViduSecret}/" $WORKINGDIR/.env @@ -243,7 +243,7 @@ Resources: # Replace certificated type sed -i "s/CERTIFICATE_TYPE=selfsigned/CERTIFICATE_TYPE=${WhichCert}/" $WORKINGDIR/.env sed -i "s/LETSENCRYPT_EMAIL=user@example.com/LETSENCRYPT_EMAIL=${LetsEncryptEmail}/" $WORKINGDIR/.env - + # Without Application if [ "${WantToDeployDemos}" == "false" ]; then sed -i "s/WITH_APP=true/WITH_APP=false/" $WORKINGDIR/docker-compose.yml @@ -265,7 +265,7 @@ Resources: content: !Sub | #!/bin/bash -x WORKINGDIR=/opt/openvidu - + # Get new amazon URL OldPublicHostname=$(cat /usr/share/openvidu/old-host-name) PublicHostname=$(curl http://169.254.169.254/latest/meta-data/public-hostname) @@ -302,14 +302,14 @@ Resources: export HOME="/root" # 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 echo "@reboot /usr/local/bin/restartCE.sh" | crontab # Download certs if "WichCert" mode 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 # Start openvidu application @@ -325,13 +325,13 @@ Resources: if [ "${WantToSendInfo}" == "true" ]; then /usr/local/bin/ping.sh || true fi - rm /usr/local/bin/ping.sh + rm /usr/local/bin/ping.sh # Wait for the app /usr/local/bin/check_app_ready.sh # 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 /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region} diff --git a/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template b/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template index 7223023f..28c7ada4 100644 --- a/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template +++ b/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template @@ -94,7 +94,7 @@ Resources: # Openvidu recording docker pull openvidu/openvidu-recording:OPENVIDU_RECORDING_DOCKER_TAG - # Openvidu CE images + # OpenVidu CE images cd /opt/openvidu docker-compose pull mode: "000755" @@ -119,11 +119,11 @@ Resources: 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 /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region} diff --git a/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh b/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh index 48a18790..475539be 100755 --- a/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh +++ b/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh @@ -16,7 +16,7 @@ fatal_error() { new_ov_installation() { printf '\n' printf '\n =======================================' - printf '\n Install Openvidu CE %s' "${OPENVIDU_VERSION}" + printf '\n Install OpenVidu CE %s' "${OPENVIDU_VERSION}" printf '\n =======================================' printf '\n' @@ -25,7 +25,7 @@ new_ov_installation() { mkdir "${OPENVIDU_FOLDER}" || fatal_error "Error while creating the folder '${OPENVIDU_FOLDER}'" # 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 \ --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" - # Uppgrade Openvidu + # Upgrade Openvidu 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" @@ -116,7 +116,7 @@ upgrade_ov() { 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' @@ -132,7 +132,7 @@ upgrade_ov() { mkdir "${TMP_FOLDER}" || fatal_error "Error while creating the folder 'temporal'" # 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 \ --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'" printf '\n - openvidu' - # Dowloading new images and stoped actual Openvidu - printf '\n => Dowloading new images...' + # Downloading new images and stopped actual Openvidu + printf '\n => Downloading new images...' printf '\n' sleep 1 @@ -160,7 +160,7 @@ upgrade_ov() { cd "${TMP_FOLDER}" || fatal_error "Error when moving to 'tmp' folder" docker-compose pull | true - printf '\n => Stoping Openvidu...' + printf '\n => Stopping Openvidu...' printf '\n' sleep 1 diff --git a/openvidu-server/deployments/ce/docker-compose/openvidu b/openvidu-server/deployments/ce/docker-compose/openvidu index 3e607918..852ad638 100755 --- a/openvidu-server/deployments/ce/docker-compose/openvidu +++ b/openvidu-server/deployments/ce/docker-compose/openvidu @@ -4,7 +4,7 @@ upgrade_ov() { 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}) - printf " => Upgrading Openvidu CE to '%s' version" "$1" + printf " => Upgrading OpenVidu CE to '%s' version" "$1" if [ "$HTTP_STATUS" == "200" ]; then printf "\n => Downloading and upgrading new version" @@ -13,7 +13,7 @@ upgrade_ov() { curl --silent ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade else printf "\n =======¡ERROR!=======" - printf "\n Openvidu CE Version '%s' not exist" "$1" + printf "\n OpenVidu CE Version '%s' not exist" "$1" printf "\n" exit 0 fi @@ -71,7 +71,7 @@ generate_report() { REPORT_CREATION_DATE=$(date +"%d-%m-%Y") REPORT_CREATION_TIME=$(date +"%H:%M:%S") 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 =======================================" @@ -128,7 +128,7 @@ generate_report() { printf '\n' cat "${OV_FOLDER}/docker-compose.yml" - + printf '\n' printf '\n ==== docker-compose.override.yml ====' printf '\n' @@ -161,7 +161,7 @@ generate_report() { printf '\n' printf "\n ---------------------------------------" - printf "\n KMS" + printf "\n KMS" printf "\n ---------------------------------------" printf '\n' kurento_logs @@ -186,10 +186,10 @@ generate_report() { printf '\n' done - } >> "${REPORT_OUPUT}" 2>&1 + } >> "${REPORT_OUTPUT}" 2>&1 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" } @@ -198,10 +198,10 @@ usage() { printf "\n\nAvailable Commands:" printf "\n\tstart\t\t\tStart 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\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\tversion\t\t\tShow version of Openvidu Server" printf "\n\treport\t\t\tGenerate a report with the current status of Openvidu" @@ -212,7 +212,7 @@ usage() { kurento_logs() { if [[ "$1" == "-f" ]]; then tail -f /opt/openvidu/kurento-logs/*.log - else + else cat /opt/openvidu/kurento-logs/*.log fi } @@ -255,7 +255,7 @@ case $1 in UPGRADE_VERSION="$2" 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 [yY][eE][sS]|[yY]) upgrade_ov "${UPGRADE_VERSION}" @@ -273,7 +273,7 @@ case $1 in report) read -r -p " You are about to generate a report on the current status of Openvidu, this may take some time. Do you want to continue? [y/N]: " response case "$response" in - [yY][eE][sS]|[yY]) + [yY][eE][sS]|[yY]) generate_report ;; *) @@ -285,4 +285,4 @@ case $1 in *) usage ;; -esac \ No newline at end of file +esac diff --git a/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template b/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template index d1ee758d..9f06b4d8 100644 --- a/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template @@ -120,11 +120,11 @@ Resources: 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 /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region} diff --git a/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template b/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template index d27c1e1b..314e18ee 100644 --- a/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template @@ -91,7 +91,7 @@ Resources: # Openvidu recording docker pull openvidu/openvidu-recording:OPENVIDU_RECORDING_DOCKER_TAG - # Openvidu PRO images + # OpenVidu Pro images cd /opt/openvidu docker-compose pull mode: "000755" @@ -122,11 +122,11 @@ Resources: 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 /usr/local/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource WaitCondition --region ${AWS::Region} diff --git a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template index a215550d..6e0379c7 100644 --- a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template @@ -1,6 +1,6 @@ --- AWSTemplateFormatVersion: 2010-09-09 -Description: Openvidu Pro CloudFormation template +Description: OpenVidu Pro CloudFormation template Parameters: @@ -41,11 +41,11 @@ Parameters: LetsEncryptEmail: Description: "If certificate type is 'letsencrypt', this email will be used for Let's Encrypt notifications" Type: String - + Recording: Description: | If 'disabled', recordings will not be active. - If 'local' recordings will be saved in EC2 instance locally. + If 'local' recordings will be saved in EC2 instance locally. If 's3', recordings will be stored in a S3 bucket" Type: String AllowedValues: @@ -328,15 +328,15 @@ Conditions: CreateS3Bucket: !And - !Equals [!Ref Recording, 's3' ] - !Equals [!Ref S3RecordingsBucketName, ''] - + Rules: RecordingValidation: - RuleCondition: + RuleCondition: Fn::Or: [ !Equals [!Ref Recording, 'disabled' ], !Equals [!Ref Recording, 'local' ] ] Assertions: - AssertDescription: If recording Storage is 'disabled' or 'local', you don't need to specify a S3 bucket. - Assert: + Assert: Fn::Equals: [ !Ref S3RecordingsBucketName, "" ] Resources: @@ -380,7 +380,7 @@ Resources: - 's3:DeleteObject' - 's3:GetObject' - 's3:PutObject' - Resource: + Resource: - Fn::If: # Get bucket name depending if the user defines a bucket name or not - CreateS3Bucket @@ -392,10 +392,10 @@ Resources: # Only apply this policy if S3 is configured - RecordingStorageIsS3 - Effect: Allow - Action: + Action: - 's3:ListBucket' - 's3:GetBucketLocation' - Resource: + Resource: - Fn::If: # Get bucket name depending if the user defines a bucket name or not - CreateS3Bucket @@ -429,7 +429,7 @@ Resources: ### Unique bucket name using Stack ID BucketName: !Join ["-" , [ 'openvidu-recordings', !Select [0, !Split ["-", !Select [2, !Split [/, !Ref AWS::StackId ]]]]]] AccessControl: Private - PublicAccessBlockConfiguration: + PublicAccessBlockConfiguration: BlockPublicAcls: true BlockPublicPolicy: true IgnorePublicAcls : true @@ -483,13 +483,13 @@ Resources: echo $PublicHostname > /usr/share/openvidu/old-host-name fi - # Openvidu Pro mode + # OpenVidu Pro mode 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 - # Openvidu Pro enviroment + # OpenVidu Pro enviroment sed -i "s/OPENVIDU_PRO_CLUSTER_ENVIRONMENT=on_premise/OPENVIDU_PRO_CLUSTER_ENVIRONMENT=aws/" $WORKINGDIR/.env # Replace certificated type @@ -650,17 +650,17 @@ Resources: export HOME="/root" # 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 - /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 echo "@reboot /usr/local/bin/restartPRO.sh" | crontab # Download certs if "WichCert" mode 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 # Start openvidu application diff --git a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/.env b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/.env index 6f247dfa..5e48f206 100644 --- a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/.env +++ b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/.env @@ -9,7 +9,7 @@ # For example: 198.51.100.1, or openvidu.example.com DOMAIN_OR_PUBLIC_IP= -# 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 @@ -42,9 +42,9 @@ LETSENCRYPT_EMAIL=user@example.com # SDKs, REST clients and browsers will have to connect to this port # HTTPS_PORT=443 -# Old paths are considered now deprecated, but still supported by default. -# OpenVidu Server will log a WARN message every time a deprecated path is called, indicating -# the new path that should be used instead. You can set property SUPPORT_DEPRECATED_API=false +# Old paths are considered now deprecated, but still supported by default. +# OpenVidu Server will log a WARN message every time a deprecated path is called, indicating +# the new path that should be used instead. You can set property SUPPORT_DEPRECATED_API=false # to stop allowing the use of old paths. # Default value is true # SUPPORT_DEPRECATED_API=true @@ -53,7 +53,7 @@ LETSENCRYPT_EMAIL=user@example.com # Default value is false # REDIRECT_WWW=false -# How many workers to configure in nginx proxy. +# How many workers to configure in nginx proxy. # The more workers, the more requests will be handled # Default value is 10240 # WORKER_CONNECTIONS=10240 @@ -88,7 +88,7 @@ OPENVIDU_PRO_CLUSTER_MODE=manual OPENVIDU_PRO_CLUSTER_ENVIRONMENT=on_premise # Unique identifier of your cluster. Each OpenVidu Server Pro instance corresponds to one cluster. -# You can launch as many clusters as you want with your license key. +# You can launch as many clusters as you want with your license key. # Cluster ID will always be stored to disk so restarting OpenVidu Server Pro will keep the same previous cluster ID # if this configuration parameter is not given a distinct value. # OPENVIDU_PRO_CLUSTER_ID= @@ -185,8 +185,8 @@ OPENVIDU_PRO_CLUSTER_LOAD_STRATEGY=streams # and write into the s3 bucket, you don't need this parameter # OPENVIDU_PRO_AWS_SECRET_KEY= -# AWS region in which the S3 bucket is located (e.g. eu-west-1). If not provided, -# the region will try to be discovered automatically, although this is not always possible. +# AWS region in which the S3 bucket is located (e.g. eu-west-1). If not provided, +# the region will try to be discovered automatically, although this is not always possible. # This property is only taken into account if OPENVIDU_PRO_RECORDING_STORAGE=s3 #OPENVIDU_PRO_AWS_REGION= diff --git a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/install_openvidu_pro.sh b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/install_openvidu_pro.sh index 79b8a676..f4111913 100755 --- a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/install_openvidu_pro.sh +++ b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/install_openvidu_pro.sh @@ -19,7 +19,7 @@ fatal_error() { new_ov_installation() { printf '\n' printf '\n =======================================' - printf '\n Install Openvidu PRO %s' "${OPENVIDU_VERSION}" + printf '\n Install OpenVidu Pro %s' "${OPENVIDU_VERSION}" 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" # 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 \ --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 Openvidu PRO successfully installed.' + printf '\n OpenVidu Pro successfully installed.' printf '\n =======================================' printf '\n' printf '\n 1. Go to openvidu folder:' @@ -167,7 +167,7 @@ upgrade_ov() { [ -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 }') [ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version" @@ -179,7 +179,7 @@ upgrade_ov() { 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' @@ -195,7 +195,7 @@ upgrade_ov() { mkdir "${TMP_FOLDER}" || fatal_error "Error while creating the folder 'temporal'" # 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 \ --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'" printf '\n - openvidu' - # Dowloading new images and stoped actual Openvidu - printf '\n => Dowloading new images...' + # Downloading new images and stopped actual Openvidu + printf '\n => Downloading new images...' printf '\n' sleep 1 @@ -244,7 +244,7 @@ upgrade_ov() { printf '\n' docker-compose pull | true - printf '\n => Stoping Openvidu...' + printf '\n => Stopping Openvidu...' printf '\n' sleep 1 @@ -368,7 +368,7 @@ upgrade_ov() { PREV_AWS_STACK_NAME=$(get_previous_env_variable AWS_STACK_NAME) PREV_AWS_CLI_DOCKER_TAG=$(get_previous_env_variable AWS_CLI_DOCKER_TAG) PREV_AWS_VOLUME_SIZE=$(get_previous_env_variable AWS_VOLUME_SIZE) - + # Replace variables in new .env-version file replace_variable_in_new_env_file "AWS_DEFAULT_REGION" "${PREV_AWS_DEFAULT_REGION}" replace_variable_in_new_env_file "AWS_INSTANCE_TYPE" "${PREV_AWS_INSTANCE_TYPE}" @@ -384,7 +384,7 @@ upgrade_ov() { # Replace new AMI replace_variable_in_new_env_file "AWS_IMAGE_ID" "${NEW_AMI_ID}" fi - + # Ready to use printf '\n' diff --git a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/openvidu b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/openvidu index b4229d5a..b5a1462e 100755 --- a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/openvidu +++ b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/openvidu @@ -4,7 +4,7 @@ upgrade_ov() { 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}) - printf " => Upgrading Openvidu PRO to '%s' version" "$1" + printf " => Upgrading OpenVidu Pro to '%s' version" "$1" if [ "$HTTP_STATUS" == "200" ]; then printf "\n => Downloading and upgrading new version" @@ -13,7 +13,7 @@ upgrade_ov() { curl --silent ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade else printf "\n =======¡ERROR!=======" - printf "\n Openvidu PRO Version '%s' not exist" "$1" + printf "\n OpenVidu Pro Version '%s' not exist" "$1" printf "\n" exit 0 fi @@ -71,7 +71,7 @@ generate_report() { REPORT_CREATION_DATE=$(date +"%d-%m-%Y") REPORT_CREATION_TIME=$(date +"%H:%M:%S") 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 =======================================" @@ -176,10 +176,10 @@ generate_report() { printf '\n' done - } >> "${REPORT_OUPUT}" 2>&1 + } >> "${REPORT_OUTPUT}" 2>&1 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" } @@ -192,7 +192,7 @@ is_external_url() { return 1 else return 0 - fi + fi } start_openvidu() { @@ -224,9 +224,9 @@ usage() { printf "\n\nAvailable Commands:" printf "\n\tstart\t\t\tStart 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\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\tversion\t\t\tShow version of Openvidu Server" printf "\n\treport\t\t\tGenerate a report with the current status of Openvidu" @@ -268,7 +268,7 @@ case $1 in UPGRADE_VERSION="$2" 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 [yY][eE][sS]|[yY]) upgrade_ov "${UPGRADE_VERSION}" @@ -298,4 +298,4 @@ case $1 in *) usage ;; -esac \ No newline at end of file +esac diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh b/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh index 403b801e..7a42d429 100755 --- a/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh +++ b/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh @@ -119,7 +119,7 @@ new_media_node_installation() { printf '\n ...' printf '\n You can also add this node from inspector' printf '\n' - printf '\n 4. Start or restart OpenVidu Pro and all containers will be provisioned' + printf '\n 4. Start or restart OpenVidu Pro and all containers will be provisioned' printf '\n automatically to all the media nodes configured in "KMS_URIS"' printf '\n More info about Media Nodes deployment here:' printf "\n --> https://docs.openvidu.io/en/${OPENVIDU_VERSION//v}/openvidu-pro/deployment/on-premises/#set-the-number-of-media-nodes-on-startup" @@ -156,7 +156,7 @@ upgrade_media_node() { [ -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 }') [ -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'" printf '\n - copy_config_files.sh' - # Dowloading new images and stoped actual Media Node - printf '\n => Dowloading new images...' + # Downloading new images and stopped actual Media Node + printf '\n => Downloading new images...' printf '\n' sleep 1 @@ -214,7 +214,7 @@ upgrade_media_node() { printf '\n' 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' sleep 1 @@ -232,7 +232,7 @@ upgrade_media_node() { docker pull $OPENVIDU_RECORDING_IMAGE || fatal "Error while pulling docker image: $OPENVIDU_RECORDING_IMAGE" docker-compose pull | true - printf '\n => Stoping Media Node...' + printf '\n => Stopping Media Node...' printf '\n' sleep 1 @@ -314,7 +314,7 @@ upgrade_media_node() { printf '\n ...' printf '\n You can also add Media Nodes from inspector' printf '\n' - printf '\n 5. Start or restart OpenVidu Pro and all containers will be provisioned' + printf '\n 5. Start or restart OpenVidu Pro and all containers will be provisioned' printf '\n automatically to all the media nodes configured in "KMS_URIS"' printf '\n More info about Media Nodes deployment here:' printf "\n --> https://docs.openvidu.io/en/${OPENVIDU_VERSION//v}/openvidu-pro/deployment/on-premises/#set-the-number-of-media-nodes-on-startup" diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/media_node b/openvidu-server/deployments/pro/docker-compose/media-node/media_node index 8b142871..118ee4f9 100755 --- a/openvidu-server/deployments/pro/docker-compose/media-node/media_node +++ b/openvidu-server/deployments/pro/docker-compose/media-node/media_node @@ -31,7 +31,7 @@ stop_containers() { kurento_logs() { if [[ "$1" == "-f" ]]; then tail -f /opt/openvidu/kurento-logs/*.log - else + else cat /opt/openvidu/kurento-logs/*.log fi } @@ -99,7 +99,7 @@ generate_report() { REPORT_CREATION_DATE=$(date +"%d-%m-%Y") REPORT_CREATION_TIME=$(date +"%H:%M:%S") 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}') { @@ -178,7 +178,7 @@ generate_report() { printf '\n' printf "\n ---------------------------------------" - printf "\n KMS" + printf "\n KMS" printf "\n ---------------------------------------" printf '\n' kurento_logs @@ -203,10 +203,10 @@ generate_report() { printf '\n' done - } >> "${REPORT_OUPUT}" 2>&1 + } >> "${REPORT_OUTPUT}" 2>&1 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" } @@ -218,7 +218,7 @@ usage() { printf "\n\trestart\t\t\tRestart media node service" printf "\n\tlogs [-f]\t\tShow media-node-controller 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\tversion\t\t\tShow version of Media Node" printf "\n\treport\t\t\tGenerate a report with the current status of Media Node" @@ -255,7 +255,7 @@ case $1 in ;; esac ;; - + kms-logs) kurento_logs $2 ;; diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env index f1cbb400..892602c2 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env @@ -9,7 +9,7 @@ # For example: 198.51.100.1, or openvidu.example.com DOMAIN_OR_PUBLIC_IP= -# 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 @@ -42,9 +42,9 @@ LETSENCRYPT_EMAIL=user@example.com # SDKs, REST clients and browsers will have to connect to this port # HTTPS_PORT=443 -# Old paths are considered now deprecated, but still supported by default. -# OpenVidu Server will log a WARN message every time a deprecated path is called, indicating -# the new path that should be used instead. You can set property SUPPORT_DEPRECATED_API=false +# Old paths are considered now deprecated, but still supported by default. +# OpenVidu Server will log a WARN message every time a deprecated path is called, indicating +# the new path that should be used instead. You can set property SUPPORT_DEPRECATED_API=false # to stop allowing the use of old paths. # Default value is true # SUPPORT_DEPRECATED_API=true @@ -53,7 +53,7 @@ LETSENCRYPT_EMAIL=user@example.com # Default value is false # REDIRECT_WWW=false -# How many workers to configure in nginx proxy. +# How many workers to configure in nginx proxy. # The more workers, the more requests will be handled # Default value is 10240 # WORKER_CONNECTIONS=10240 @@ -88,7 +88,7 @@ OPENVIDU_PRO_CLUSTER_MODE=manual OPENVIDU_PRO_CLUSTER_ENVIRONMENT=on_premise # Unique identifier of your cluster. Each OpenVidu Server Pro instance corresponds to one cluster. -# You can launch as many clusters as you want with your license key. +# You can launch as many clusters as you want with your license key. # Cluster ID will always be stored to disk so restarting OpenVidu Server Pro will keep the same previous cluster ID # if this configuration parameter is not given a distinct value. # OPENVIDU_PRO_CLUSTER_ID= @@ -185,8 +185,8 @@ OPENVIDU_PRO_CLUSTER_LOAD_STRATEGY=streams # and write into the s3 bucket, you don't need this parameter # OPENVIDU_PRO_AWS_SECRET_KEY= -# AWS region in which the S3 bucket is located (e.g. eu-west-1). If not provided, -# the region will try to be discovered automatically, although this is not always possible. +# AWS region in which the S3 bucket is located (e.g. eu-west-1). If not provided, +# the region will try to be discovered automatically, although this is not always possible. # This property is only taken into account if OPENVIDU_PRO_RECORDING_STORAGE=s3 #OPENVIDU_PRO_AWS_REGION= diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh index 5cc67761..f4ef5396 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh @@ -19,7 +19,7 @@ fatal_error() { new_ov_installation() { printf '\n' printf '\n =======================================' - printf '\n Install Openvidu PRO %s' "${OPENVIDU_VERSION}" + printf '\n Install OpenVidu Pro %s' "${OPENVIDU_VERSION}" 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" # 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 \ --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 Openvidu PRO successfully installed.' + printf '\n OpenVidu Pro successfully installed.' printf '\n =======================================' printf '\n' printf '\n 1. Go to openvidu folder:' @@ -167,7 +167,7 @@ upgrade_ov() { [ -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 }') [ -z "${OPENVIDU_PREVIOUS_VERSION}" ] && fatal_error "Can't find previous OpenVidu version" @@ -179,7 +179,7 @@ upgrade_ov() { 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' @@ -195,7 +195,7 @@ upgrade_ov() { mkdir "${TMP_FOLDER}" || fatal_error "Error while creating the folder 'temporal'" # 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 \ --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'" printf '\n - openvidu' - # Dowloading new images and stoped actual Openvidu - printf '\n => Dowloading new images...' + # Downloading new images and stopped actual Openvidu + printf '\n => Downloading new images...' printf '\n' sleep 1 @@ -244,7 +244,7 @@ upgrade_ov() { printf '\n' docker-compose pull | true - printf '\n => Stoping Openvidu...' + printf '\n => Stopping Openvidu...' printf '\n' sleep 1 @@ -368,7 +368,7 @@ upgrade_ov() { PREV_AWS_STACK_NAME=$(get_previous_env_variable AWS_STACK_NAME) PREV_AWS_CLI_DOCKER_TAG=$(get_previous_env_variable AWS_CLI_DOCKER_TAG) PREV_AWS_VOLUME_SIZE=$(get_previous_env_variable AWS_VOLUME_SIZE) - + # Replace variables in new .env-version file replace_variable_in_new_env_file "AWS_DEFAULT_REGION" "${PREV_AWS_DEFAULT_REGION}" replace_variable_in_new_env_file "AWS_INSTANCE_TYPE" "${PREV_AWS_INSTANCE_TYPE}" @@ -384,7 +384,7 @@ upgrade_ov() { # Replace new AMI replace_variable_in_new_env_file "AWS_IMAGE_ID" "${NEW_AMI_ID}" fi - + # Ready to use printf '\n' diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu index b4229d5a..b5a1462e 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu @@ -4,7 +4,7 @@ upgrade_ov() { 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}) - printf " => Upgrading Openvidu PRO to '%s' version" "$1" + printf " => Upgrading OpenVidu Pro to '%s' version" "$1" if [ "$HTTP_STATUS" == "200" ]; then printf "\n => Downloading and upgrading new version" @@ -13,7 +13,7 @@ upgrade_ov() { curl --silent ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade else printf "\n =======¡ERROR!=======" - printf "\n Openvidu PRO Version '%s' not exist" "$1" + printf "\n OpenVidu Pro Version '%s' not exist" "$1" printf "\n" exit 0 fi @@ -71,7 +71,7 @@ generate_report() { REPORT_CREATION_DATE=$(date +"%d-%m-%Y") REPORT_CREATION_TIME=$(date +"%H:%M:%S") 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 =======================================" @@ -176,10 +176,10 @@ generate_report() { printf '\n' done - } >> "${REPORT_OUPUT}" 2>&1 + } >> "${REPORT_OUTPUT}" 2>&1 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" } @@ -192,7 +192,7 @@ is_external_url() { return 1 else return 0 - fi + fi } start_openvidu() { @@ -224,9 +224,9 @@ usage() { printf "\n\nAvailable Commands:" printf "\n\tstart\t\t\tStart 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\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\tversion\t\t\tShow version of Openvidu Server" printf "\n\treport\t\t\tGenerate a report with the current status of Openvidu" @@ -268,7 +268,7 @@ case $1 in UPGRADE_VERSION="$2" 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 [yY][eE][sS]|[yY]) upgrade_ov "${UPGRADE_VERSION}" @@ -298,4 +298,4 @@ case $1 in *) usage ;; -esac \ No newline at end of file +esac diff --git a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh index 253a91c0..1383c370 100755 --- a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh +++ b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh @@ -9,14 +9,14 @@ if [ ! -z "${WAIT_KIBANA_URL}" ]; then printf "\n" until $(curl --insecure --output /dev/null --silent --head --fail --max-time 10 --connect-timeout 10 ${WAIT_KIBANA_URL}) - do + do printf "\n Waiting for kibana in '%s' URL..." "${WAIT_KIBANA_URL}" sleep 1 done printf "\n ==== Kibana is Ready ====" fi -# Launch Openvidu Pro +# Launch OpenVidu Pro printf "\n" printf "\n =======================================" printf "\n = LAUNCH OPENVIDU-SERVER =" diff --git a/openvidu-server/src/main/java/io/openvidu/server/resources/FrontendResourceHandler.java b/openvidu-server/src/main/java/io/openvidu/server/resources/FrontendResourceHandler.java index 4add4b05..5b6d9c80 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/resources/FrontendResourceHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/resources/FrontendResourceHandler.java @@ -28,8 +28,8 @@ import io.openvidu.server.config.OpenviduConfig; * This class changes the path where static files are served from / to * /NEW_FRONTEND_PATH. Entrypoint file index.html must have tag * - * - * 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 * * @author Pablo Fuente (pablofuenteperez@gmail.com)