From db8bf072c1e02a3b9928b25ce6ec29f9d7908b81 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 16 Dec 2023 11:54:14 +0100 Subject: [PATCH 1/4] add turn port --- conf/.env | 4 ++-- manifest.toml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/.env b/conf/.env index c9f73da..92ada77 100644 --- a/conf/.env +++ b/conf/.env @@ -1,3 +1,3 @@ PORT=__PORT__ -EXTRA_ICE_SERVERS=turn:localhost:3478 -WEBTORRENT_TRACKERS=ws://localhost:8000 \ No newline at end of file +EXTRA_ICE_SERVERS=turn:127.0.0.1:__PORT_TURN__ +WEBTORRENT_TRACKERS=ws://127.0.0.1:8000 \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 9f6899a..f3f8f3b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -47,6 +47,7 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_commit" [resources.ports] + turn.default = 3478 [resources.system_user] From bd2129d99fcc26b422732fc8d9b764091e532921 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 16 Dec 2023 11:55:56 +0100 Subject: [PATCH 2/4] cleaning --- scripts/install | 4 ---- scripts/remove | 4 ---- scripts/restore | 1 - scripts/upgrade | 4 ---- 4 files changed, 13 deletions(-) diff --git a/scripts/install b/scripts/install index ef2639c..7aff9b2 100644 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,6 @@ ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" @@ -32,11 +31,9 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Configuring NGINX web server..." --weight=4 -# Create a dedicated NGINX config ynh_add_nginx_config env_path="$PATH" -# Create a dedicated systemd config ynh_add_systemd_config yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log" @@ -57,7 +54,6 @@ popd #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=6 -# Start a systemd service ynh_systemd_action --service_name=$app --action=restart --log_path="systemd" #================================================= diff --git a/scripts/remove b/scripts/remove index 9fff982..4b74a36 100644 --- a/scripts/remove +++ b/scripts/remove @@ -15,20 +15,16 @@ source /usr/share/yunohost/helpers # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing $app service integration..." --weight=2 yunohost service remove $app fi -# Remove the dedicated systemd config ynh_remove_systemd_config -# Remove the dedicated NGINX config ynh_remove_nginx_config -# Remove metapackage and its dependencies ynh_remove_nodejs #================================================= diff --git a/scripts/restore b/scripts/restore index c63a02b..63c710d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -24,7 +24,6 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=7 -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f20b5da..b241cb6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,7 +32,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 - # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" fi @@ -44,14 +43,11 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 -# Create a dedicated NGINX config ynh_add_nginx_config -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version env_path="$PATH" -# Create a dedicated systemd config ynh_add_systemd_config yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log" From 6929a92a44059631614508345695a8e1f40407db Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 16 Dec 2023 11:56:10 +0100 Subject: [PATCH 3/4] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f3f8f3b..309fe6c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "FilePizza" description.en = "Peer-to-peer file transfers in your browser" description.fr = "Transferts de fichiers pair-à-pair dans votre navigateur" -version = "1.1.0~ynh6" +version = "1.1.0~ynh7" maintainers = ["eric_G"] From f612071ce7d46c3ff896de439431464398f3b13e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 16 Dec 2023 10:56:15 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3ca5087..28a4a21 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Using WebRTC, FilePizza eliminates the initial upload step required by other web-based file sharing services. When senders initialize a transfer, they receive a "tempalink" they can distribute to recipients. Upon visiting this link, recipients' browsers connect directly to the sender’s browser and may begin downloading the selected file. Because data is never stored in an intermediary server, the transfer is fast, private, and secure. -**Shipped version:** 1.1.0~ynh6 +**Shipped version:** 1.1.0~ynh7 **Demo:** https://file.pizza/ diff --git a/README_fr.md b/README_fr.md index 3d62302..1938079 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Using WebRTC, FilePizza eliminates the initial upload step required by other web-based file sharing services. When senders initialize a transfer, they receive a "tempalink" they can distribute to recipients. Upon visiting this link, recipients' browsers connect directly to the sender’s browser and may begin downloading the selected file. Because data is never stored in an intermediary server, the transfer is fast, private, and secure. -**Version incluse :** 1.1.0~ynh6 +**Version incluse :** 1.1.0~ynh7 **Démo :** https://file.pizza/