From 4a3a0d9e956423fb1c0b5d0b9aee4bc19b366ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 May 2023 22:12:22 +0200 Subject: [PATCH 1/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9e79e0a..8c4621f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://file.pizza/" code = "https://github.com/kern/filepizza" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.1.19" architectures = "all" multi_instance = true ldap = false From 9a960da10be7e21ab2baef427b38f9548bceab2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:22:18 +0200 Subject: [PATCH 2/7] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 8c4621f..f06e444 100644 --- a/manifest.toml +++ b/manifest.toml @@ -28,7 +28,6 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - full_domain = true [install.init_main_permission] type = "group" From b52bb2c4929a8886cb46723728f9a137ddebb4ae Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Aug 2023 12:15:20 +0200 Subject: [PATCH 3/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f06e444..43f6236 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://file.pizza/" code = "https://github.com/kern/filepizza" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false From 77ec59139cfc2054ae40273fb6263fa44c69aea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 3 Sep 2023 18:29:44 +0200 Subject: [PATCH 4/7] Update remove --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 1827377..9fff982 100644 --- a/scripts/remove +++ b/scripts/remove @@ -18,7 +18,7 @@ source /usr/share/yunohost/helpers # 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 Etherpad service integration..." --weight=2 + ynh_script_progression --message="Removing $app service integration..." --weight=2 yunohost service remove $app fi From 76ca40fb7ce3e02185889cfd223e6d0c95734be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Dec 2023 21:29:08 +0100 Subject: [PATCH 5/7] cleaning --- manifest.toml | 3 +++ scripts/install | 22 ++++++---------------- scripts/restore | 22 ++-------------------- scripts/upgrade | 19 ++----------------- 4 files changed, 13 insertions(+), 53 deletions(-) diff --git a/manifest.toml b/manifest.toml index 43f6236..9a67175 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,8 +19,11 @@ code = "https://github.com/kern/filepizza" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" diff --git a/scripts/install b/scripts/install index b16cde3..ef2639c 100644 --- a/scripts/install +++ b/scripts/install @@ -35,6 +35,12 @@ 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" + #================================================= # INSTALL FILEPIZZA #================================================= @@ -46,22 +52,6 @@ pushd "$install_dir" ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm run-script build popd -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=4 - -env_path="$PATH" -# Create a dedicated systemd config -ynh_add_systemd_config - -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 - -yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log" - #================================================= # START SYSTEMD SERVICE #================================================= diff --git a/scripts/restore b/scripts/restore index c578403..c63a02b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,14 +9,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -40,14 +32,11 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= ynh_script_progression --message="Restoring the systemd configuration..." --weight=8 +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 - yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log" #================================================= @@ -57,13 +46,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=8 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -#================================================= -# GENERIC FINALIZATION -#================================================= -# RELOAD NGINX AND PHP-FPM -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=2 - ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6147051..f20b5da 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,23 +47,15 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=5 - # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --weight=2 - 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" + #================================================= # INSTALL FILEPIZZA #================================================= @@ -75,13 +67,6 @@ pushd "$install_dir" ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm run-script build popd -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log" - #================================================= # START SYSTEMD SERVICE #================================================= From a1c60b782bcad43a62adeb0b7d360cd014bfdabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 10 Dec 2023 11:18:32 +0100 Subject: [PATCH 6/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9a67175..9f6899a 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~ynh5" +version = "1.1.0~ynh6" maintainers = ["eric_G"] From 56adfb9ab78d69fc769b1d94b1e912a9432fa676 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 10 Dec 2023 10:18:37 +0000 Subject: [PATCH 7/7] 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 8d3dedc..3ca5087 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~ynh5 +**Shipped version:** 1.1.0~ynh6 **Demo:** https://file.pizza/ diff --git a/README_fr.md b/README_fr.md index 0310c2a..3d62302 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~ynh5 +**Version incluse :** 1.1.0~ynh6 **Démo :** https://file.pizza/