From db396d88fdc7fb7db8596fa221d830f229707f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 Mar 2023 15:11:44 +0100 Subject: [PATCH 1/4] cleaning --- check_process | 24 ------------------------ conf/app.src | 5 ----- manifest.toml | 9 ++++++++- 3 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 check_process delete mode 100644 conf/app.src diff --git a/check_process b/check_process deleted file mode 100644 index c379534..0000000 --- a/check_process +++ /dev/null @@ -1,24 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=0 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - #upgrade=1 from_commit=CommitHash - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666& diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index d11a06d..0000000 --- a/conf/app.src +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE_URL=https://github.com/kern/filepizza/archive/e4fb3431fb5f3b3e5593e44df3837017ffc10f86.tar.gz -SOURCE_SUM=41afd7f607490db9263ea8a4a6a179cbc700f18cbf7670334a6d92fed413d7bf -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true diff --git a/manifest.toml b/manifest.toml index cea4119..cfbd15c 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.13" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = true ldap = false @@ -35,6 +35,13 @@ ram.runtime = "50M" default = "visitors" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://github.com/kern/filepizza/archive/e4fb3431fb5f3b3e5593e44df3837017ffc10f86.tar.gz" + sha256 = "41afd7f607490db9263ea8a4a6a179cbc700f18cbf7670334a6d92fed413d7bf" + [resources.ports] [resources.system_user] From 2bdf4869cfe3f347facbd081b4573fd3a865760a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 Mar 2023 15:12:23 +0100 Subject: [PATCH 2/4] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index cfbd15c..b04c24b 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~ynh4" +version = "1.1.0~ynh5" maintainers = ["eric_G"] From fb2c12f5b22e100c21208c0404c4aa2d3e4d4c61 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 16 Mar 2023 14:12:28 +0000 Subject: [PATCH 3/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 fb2b80a..7f09f43 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~ynh4 +**Shipped version:** 1.1.0~ynh5 **Demo:** https://file.pizza/ diff --git a/README_fr.md b/README_fr.md index d386958..6a72b2a 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~ynh4 +**Version incluse :** 1.1.0~ynh5 **Démo :** https://file.pizza/ From 2f2d5aba3f7b4aa48c01d94d89730c7ace9f0c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 17 Mar 2023 09:54:19 +0100 Subject: [PATCH 4/4] Update remove --- scripts/remove | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/scripts/remove b/scripts/remove index 00e37ab..1827377 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,17 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? port=$(ynh_app_setting_get --app=$app --key=port) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - #================================================= # STANDARD REMOVE #================================================= @@ -33,48 +22,15 @@ then yunohost service remove $app fi -#================================================= -# STOP AND REMOVE SERVICE -#================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 - # Remove the dedicated systemd config ynh_remove_systemd_config -#================================================= -# REMOVE ETHERPAD MAIN DIR -#================================================= -ynh_script_progression --message="Removing filepizza main directory..." --weight=3 - -# Remove the app directory securely -#REMOVEME? ynh_secure_remove --file="$install_dir" - -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 - # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=1 - # Remove metapackage and its dependencies ynh_remove_nodejs -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1 - -# Delete a system user -#REMOVEME? ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #=================================================