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/ diff --git a/manifest.toml b/manifest.toml index 9e79e0a..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"] @@ -16,11 +16,14 @@ demo = "https://file.pizza/" code = "https://github.com/kern/filepizza" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -28,7 +31,6 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - full_domain = true [install.init_main_permission] type = "group" 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/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 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 #=================================================