From d85d9331f3a2ee81409c89f5876ea74302e57dd6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 19 Apr 2021 10:57:43 +0200 Subject: [PATCH 1/4] Cleaning up --- conf/turnserver.conf | 8 ++++---- scripts/install | 20 +++++--------------- scripts/upgrade | 18 +++--------------- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/conf/turnserver.conf b/conf/turnserver.conf index dfc2609..991bce2 100644 --- a/conf/turnserver.conf +++ b/conf/turnserver.conf @@ -27,7 +27,7 @@ # TLS version 1.0, 1.1 and 1.2. # For secure UDP connections, Coturn supports DTLS version 1. # -tls-listening-port=__TLS_PORT__ +tls-listening-port=__TURNSERVER_TLS_PORT__ # Alternative listening port for UDP and TCP listeners; # default (or zero) value means "listening port plus one". @@ -43,7 +43,7 @@ tls-listening-port=__TLS_PORT__ # Alternative listening port for TLS and DTLS protocols. # Default (or zero) value means "TLS listening port plus one". # -alt-tls-listening-port=__TLS_ALT_PORT__ +alt-tls-listening-port=__TURNSERVER_ALT_TLS_PORT__ # Some network setups will require using a TCP reverse proxy in front # of the STUN server. If the proxy port option is set a single listener @@ -241,7 +241,7 @@ max-port=65535 # in the user database (if present). The database-stored value can be changed on-the-fly # by a separate program, so this is why that mode is considered 'dynamic'. # -static-auth-secret=__TURNPWD__ +static-auth-secret=__TURNSERVER_PWD__ # Server name used for # the oAuth authentication purposes. @@ -297,7 +297,7 @@ userdb=/var/lib/turn/turndb # http://www.postgresql.org/docs/9.2/static/libpq-connect.html#LIBPQ-CONNSTRING # for 9.x and newer connection string formats. # -#psql-userdb="host= dbname=__DB_NAME__ user=__DB_USER__ password=__DB_PASSWORD__ connect_timeout=30" +#psql-userdb="host= dbname= user= password= connect_timeout=30" # MySQL database connection string in the case that you are using MySQL # as the user database. diff --git a/scripts/install b/scripts/install index 1926f0b..f6c1d9d 100644 --- a/scripts/install +++ b/scripts/install @@ -33,7 +33,7 @@ app=$YNH_APP_INSTANCE_NAME ynh_script_progression --message="Storing installation settings..." --weight=4 ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=no_sso --value true +ynh_app_setting_set --app=$app --key=no_sso --value=true #================================================= # CREATE A DH FILE @@ -113,18 +113,9 @@ turnserver_pwd=$(ynh_string_random --length=30) ynh_app_setting_set --app=$app --key=turnserver_pwd --value=$turnserver_pwd ynh_print_ON -mv /etc/turnserver.conf /etc/turnserver.conf.orig - coturn_config_path="/etc/turnserver.conf" -cp ../conf/turnserver.conf "$coturn_config_path" -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=__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" -ynh_print_ON + +ynh_add_config --template="/etc/turnserver.conf" --destination="$coturn_config_path" # Get public IP and set as external IP for coturn # note: '|| true' is used to ignore the errors if we can't get the public ipv4 or ipv6 @@ -154,8 +145,7 @@ chmod +x $data_path/Coturn_config_rotate.sh # SET COTURN CRON #================================================= -cp -f ../conf/cron_coturn /etc/cron.d/$app -ynh_replace_string --match_string="__DATA_PATH__" --replace_string=$data_path --target_file=/etc/cron.d/$app +ynh_add_config --template="../conf/cron_coturn" --destination="/etc/cron.d/$app" #================================================= # SETUP LOGROTATE @@ -181,7 +171,7 @@ setfacl -R -m user:turnserver:rwX /var/log/$app #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 -yunohost service add $app --description="Coturn TURN server" --log="/var/log/$app/$app.log" --needs_exposed_ports $turnserver_tls_port +yunohost service add $app --description="Coturn TURN server" --log="/var/log/$app/$app.log" --needs_exposed_ports="$turnserver_tls_port" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 1696e74..9f08bc1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,18 +89,7 @@ ynh_script_progression --message="Configuring Coturn..." --weight=2 coturn_config_path="/etc/turnserver.conf" -ynh_backup_if_checksum_is_different --file="$coturn_config_path" - -cp ../conf/turnserver.conf "$coturn_config_path" - -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=__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" -ynh_print_ON +ynh_add_config --template="/etc/turnserver.conf" --destination="$coturn_config_path" # Get public IP and set as external IP for coturn # note: '|| true' is used to ignore the errors if we can't get the public ipv4 or ipv6 @@ -130,8 +119,7 @@ chmod +x $data_path/Coturn_config_rotate.sh # SET COTURN CRON #================================================= -cp -f ../conf/cron_coturn /etc/cron.d/$app -ynh_replace_string --match_string="__DATA_PATH__" --replace_string=$data_path --target_file=/etc/cron.d/$app +ynh_add_config --template="../conf/cron_coturn" --destination="/etc/cron.d/$app" #================================================= # MIGRATION 3 : USE STANDARD ACCESS FOR CERTIFCATE @@ -169,7 +157,7 @@ setfacl -R -m user:turnserver:rwX /var/log/$app #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 -yunohost service add $app --description="Coturn TURN server" --log="/var/log/$app/$app.log" --needs_exposed_ports $turnserver_tls_port +yunohost service add $app --description="Coturn TURN server" --log="/var/log/$app/$app.log" --needs_exposed_ports="$turnserver_tls_port" #================================================= # START SYSTEMD SERVICE From f23e7fc25f557e5a01929bace649ca9280f56a5a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Apr 2021 18:51:07 +0200 Subject: [PATCH 2/4] Fix links --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4771b0e..d6fedfb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ *[Lire ce readme en français.](./README_fr.md)* > *This package allows you to install Coturn quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview TURN and STUN server for VoIP diff --git a/README_fr.md b/README_fr.md index f3c1cdd..74910d3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,7 +6,7 @@ *[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer Coturn rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install) pour apprendre comment l'installer.* ## Overview Serveur TURN et STUN pour VoIP. STUN (Session Traversal Utilities for NAT) et TURN (Traversal Using Relays around NAT) sont des protocoles qui peuvent être utilisés pour fournir une traversée NAT pour VoIP et WebRTC. Ce package fournit un serveur et une passerelle de traversée NAT du trafic multimédia VoIP. From 2474d3efad4044c38af2045c4ca05fe9aaee05be Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Apr 2021 19:28:27 +0200 Subject: [PATCH 3/4] Fix --- scripts/install | 2 +- scripts/remove | 1 - scripts/upgrade | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index f6c1d9d..af36da6 100644 --- a/scripts/install +++ b/scripts/install @@ -115,7 +115,7 @@ ynh_print_ON coturn_config_path="/etc/turnserver.conf" -ynh_add_config --template="/etc/turnserver.conf" --destination="$coturn_config_path" +ynh_add_config --template="../conf/turnserver.conf" --destination="$coturn_config_path" # Get public IP and set as external IP for coturn # note: '|| true' is used to ignore the errors if we can't get the public ipv4 or ipv6 diff --git a/scripts/remove b/scripts/remove index b5e86a4..88dd904 100644 --- a/scripts/remove +++ b/scripts/remove @@ -55,7 +55,6 @@ ynh_remove_app_dependencies ynh_script_progression --message="Removing Coturn configuration file..." --weight=2 ynh_secure_remove --file="/etc/turnserver.conf" -mv /etc/turnserver.conf.orig /etc/turnserver.conf #================================================= # REMOVE LOGROTATE CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 9f08bc1..25fa4b7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,7 +89,7 @@ ynh_script_progression --message="Configuring Coturn..." --weight=2 coturn_config_path="/etc/turnserver.conf" -ynh_add_config --template="/etc/turnserver.conf" --destination="$coturn_config_path" +ynh_add_config --template="../conf/turnserver.conf" --destination="$coturn_config_path" # Get public IP and set as external IP for coturn # note: '|| true' is used to ignore the errors if we can't get the public ipv4 or ipv6 From 55b40d74bbfc3b346eb84c079f44db381bce7e14 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Apr 2021 19:34:58 +0200 Subject: [PATCH 4/4] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 498f457..8d0dc96 100644 --- a/scripts/restore +++ b/scripts/restore @@ -113,7 +113,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="Coturn TURN server" --log="/var/log/$app/$app.log" --needs_exposed_ports $turnserver_tls_port +yunohost service add $app --description="Coturn TURN server" --log="/var/log/$app/$app.log" --needs_exposed_ports="$turnserver_tls_port" #================================================= # OPEN THE PORT