From 78fd0317cc1d78bb20ebbc4f2246f697fd2fc1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 Nov 2023 21:46:50 +0100 Subject: [PATCH] fix --- manifest.toml | 3 +++ scripts/restore | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index fe0f1cf..744f6a5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,8 +23,11 @@ cpe = "cpe:2.3:a:kimai:kimai_2" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" diff --git a/scripts/restore b/scripts/restore index af7bd6e..680f595 100755 --- a/scripts/restore +++ b/scripts/restore @@ -22,6 +22,13 @@ chown -R $app:www-data "$install_dir" setfacl -dR -m g:"www-data":rwX -m u:$app:rwX "$install_dir/var/" setfacl -R -m g:"www-data":rwX -m u:$app:rwX "$install_dir/var/" +#================================================= +# 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 THE PHP-FPM CONFIGURATION #================================================= @@ -31,13 +38,6 @@ 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" -#================================================= -# 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 - #================================================= # GENERIC FINALIZATION #=================================================