From c9a634e096596847567766aa3ca0a1b0789c90bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:14:37 +0200 Subject: [PATCH] fix --- manifest.toml | 4 ++-- scripts/restore | 17 ++++------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/manifest.toml b/manifest.toml index 58cfcce..468db50 100644 --- a/manifest.toml +++ b/manifest.toml @@ -12,7 +12,7 @@ maintainers = ["eric_G"] [upstream] license = "GPL-3.0-or-later" website = "https://dev.deluge-torrent.org/" -admindoc = "https://yunohost.org/packaging_apps" +admindoc = "https://deluge.readthedocs.io/en/latest/" code = "https://git.deluge-torrent.org/deluge" [integration] @@ -22,7 +22,7 @@ multi_instance = false ldap = false sso = false disk = "50M" -ram.build = "50M" +ram.build = "100M" ram.runtime = "50M" [install] diff --git a/scripts/restore b/scripts/restore index 6e9995e..df8f13a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -19,13 +19,6 @@ ynh_restore_file --origin_path="$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=1 - -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql - #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= @@ -33,18 +26,15 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 -# This should be a symetric version of what happens in the install script - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/systemd/system/$app.service" +ynh_restore_file --origin_path="/etc/systemd/system/${app}-web.service" systemctl enable $app.service --quiet +systemctl enable ${app}-web.service --quiet yunohost service add $app --description="Lightweight BitTorrent client" --log="/var/log/$app/$app.log" - -ynh_restore_file --origin_path="/etc/logrotate.d/$app" +yunohost service add ${app}-web --description=BitTorrent UI --log=/var/log/$app/$app.log #================================================= # GENERIC FINALIZATION @@ -55,6 +45,7 @@ ynh_script_progression --message="Reloading NGINX web server and $app's service. # Typically you only have either $app or php-fpm but not both at the same time... ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=${app}-web --action="start" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=nginx --action=reload