From f4c2f0b730240329c5b1525ce5c11419110f315b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 19 Feb 2021 10:38:54 +0100 Subject: [PATCH] Fix --- conf/coturn/turnserver.conf | 2 +- conf/ice-servers.json | 9 ++++++--- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/conf/coturn/turnserver.conf b/conf/coturn/turnserver.conf index 96bebe9..6c42720 100644 --- a/conf/coturn/turnserver.conf +++ b/conf/coturn/turnserver.conf @@ -4,7 +4,7 @@ static-auth-secret=__TURNSERVER_PWD__ realm=__DOMAIN__ tls-listening-port=__TURNSERVER_TLS_PORT__ -alt-tls-listening-port=__TURNSERVER_TLS_ALT_PORT__ +alt-tls-listening-port=__TURNSERVER_ALT_TLS_PORT__ min-port=49153 max-port=49193 cli-port=__CLI_PORT__ diff --git a/conf/ice-servers.json b/conf/ice-servers.json index 2830c5e..7ee017b 100644 --- a/conf/ice-servers.json +++ b/conf/ice-servers.json @@ -2,14 +2,17 @@ { "urls": [ "turn:__DOMAIN__:__TURNSERVER_TLS_PORT__", - "turn:__DOMAIN__:__TURNSERVER_TLS_ALT_PORT__", + "turn:__DOMAIN__:__TURNSERVER_ALT_TLS_PORT__", "turn:__DOMAIN__:__TURNSERVER_TLS_PORT__?transport=tcp", - "turn:__DOMAIN__:__TURNSERVER_TLS_ALT_PORT__?transport=tcp", + "turn:__DOMAIN__:__TURNSERVER_ALT_TLS_PORT__?transport=tcp", "turn:__DOMAIN__:__TURNSERVER_TLS_PORT__?transport=udp", - "turn:__DOMAIN__:__TURNSERVER_TLS_ALT_PORT__?transport=udp" + "turn:__DOMAIN__:__TURNSERVER_ALT_TLS_PORT__?transport=udp" ], "username": "__APP__", "credential": "__TURNSERVER_PWD__", "credentialType": "hmac-sha1" } ] + + +ALT_TLS_PORT \ No newline at end of file diff --git a/scripts/install b/scripts/install index ce92324..a8da11a 100755 --- a/scripts/install +++ b/scripts/install @@ -218,7 +218,7 @@ ynh_store_file_checksum --file="$final_path/groups/$group_name.json" # ynh_replace_string --match_string=__DOMAIN__ --replace_string=$domain --target_file="$final_path/data/ice-servers.json" # ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file="$final_path/data/ice-servers.json" # ynh_replace_string --match_string=__TLS_PORT__ --replace_string=$turnserver_tls_port --target_file="$final_path/data/ice-servers.json" -# ynh_replace_string --match_string=__TLS_ALT_PORT__ --replace_string=$turnserver_alt_tls_port --target_file="$final_path/data/ice-servers.json" +# ynh_replace_string --match_string=__ALT_TLS_PORT__ --replace_string=$turnserver_alt_tls_port --target_file="$final_path/data/ice-servers.json" # ynh_print_OFF # ynh_replace_string --match_string=__TURNPWD__ --replace_string=$turnserver_pwd --target_file="$final_path/data/ice-servers.json" # ynh_print_ON diff --git a/scripts/restore b/scripts/restore index 3c3cfd3..c101d41 100755 --- a/scripts/restore +++ b/scripts/restore @@ -146,8 +146,8 @@ ynh_print_ON # ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file="$coturn_config_path" # ynh_replace_string --match_string=__DOMAIN__ --replace_string=$domain --target_file="$coturn_config_path" -# ynh_replace_string --match_string=__TLS_PORT__ --replace_string=$turnserver_tls_port --target_file="$coturn_config_path" -# ynh_replace_string --match_string=__TLS_ALT_PORT__ --replace_string=$turnserver_alt_tls_port --target_file="$coturn_config_path" +# ynh_replace_string --match_string=__TURNSERVER_TLS_PORT__ --replace_string=$turnserver_tls_port --target_file="$coturn_config_path" +# ynh_replace_string --match_string=__TURNSERVER_ALT_TLS_PORT__ --replace_string=$turnserver_alt_tls_port --target_file="$coturn_config_path" # ynh_replace_string --match_string=__CLI_PORT__ --replace_string=$cli_port --target_file="$coturn_config_path" # ynh_print_OFF # ynh_replace_string --match_string=__TURNPWD__ --replace_string=$turnserver_pwd --target_file="$coturn_config_path" diff --git a/scripts/upgrade b/scripts/upgrade index 638f89b..209f5c5 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -170,7 +170,7 @@ ynh_script_progression --message="Updating Coturn config..." --weight=1 # ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file="$coturn_config_path" # ynh_replace_string --match_string=__DOMAIN__ --replace_string=$domain --target_file="$coturn_config_path" # ynh_replace_string --match_string=__TURNSERVER_TLS_PORT__ --replace_string=$turnserver_tls_port --target_file="$coturn_config_path" -# ynh_replace_string --match_string=__TURNSERVER_TLS_ALT_PORT__ --replace_string=$turnserver_alt_tls_port --target_file="$coturn_config_path" +# ynh_replace_string --match_string=__TURNSERVER_ALT_TLS_PORT__ --replace_string=$turnserver_alt_tls_port --target_file="$coturn_config_path" # ynh_replace_string --match_string=__CLI_PORT__ --replace_string=$cli_port --target_file="$coturn_config_path" # ynh_print_OFF # ynh_replace_string --match_string=__TURNSERVER_PWD__ --replace_string=$turnserver_pwd --target_file="$coturn_config_path"