From 239be6aba6cd7db4d1611139e07715fe60d46c41 Mon Sep 17 00:00:00 2001 From: anmol26s Date: Sun, 7 Feb 2021 23:12:41 +0530 Subject: [PATCH 1/2] Fixed https://github.com/YunoHost-Apps/firefly-iii/issues/28https://github.com/YunoHost-Apps/firefly-iii/issues/31 --- conf/cron | 2 ++ manifest.json | 2 +- scripts/backup | 6 ++++++ scripts/install | 11 +++++++++++ scripts/remove | 10 ++++++++++ scripts/restore | 7 +++++++ scripts/upgrade | 21 ++++++++++++++------- 7 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 conf/cron diff --git a/conf/cron b/conf/cron new file mode 100644 index 0000000..69dc851 --- /dev/null +++ b/conf/cron @@ -0,0 +1,2 @@ +# cron job for __APP__ +0 3 * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/artisan firefly-iii:cron diff --git a/manifest.json b/manifest.json index 578c278..308137f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted financial manager.", "fr": "Gestionnaire de finances personnelles." }, - "version": "5.4.6~ynh1", + "version": "5.4.6~ynh2", "url": "https://firefly-iii.org/", "license": "GPL-3.0-or-later", "maintainer": { diff --git a/scripts/backup b/scripts/backup index 836e218..4650867 100755 --- a/scripts/backup +++ b/scripts/backup @@ -60,6 +60,12 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_backup --src_path="/etc/logrotate.d/$app" +#================================================= +# BACKUP A CRON FILE +#================================================= + +ynh_backup --src_path="/etc/cron.d/$app" + #================================================= # BACKUP THE MYSQL DATABASE #================================================= diff --git a/scripts/install b/scripts/install index 63426ba..8067537 100755 --- a/scripts/install +++ b/scripts/install @@ -171,6 +171,17 @@ ynh_script_progression --message="Securing files and directories..." chown -R $app:$app $final_path chmod -R 775 ${final_path}/storage +#================================================= +# SETUP A CRON +#================================================= +ynh_script_progression --message="Setuping a cron..." + +cp ../conf/cron /etc/cron.d/$app + +ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="/etc/cron.d/$app" +ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/cron.d/$app" +ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion" --target_file="/etc/cron.d/$app" + #================================================= # SETUP LOGROTATE #================================================= diff --git a/scripts/remove b/scripts/remove index 62ae859..0f5539b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -63,6 +63,16 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." # Remove the dedicated PHP-FPM config ynh_remove_fpm_config +#================================================= +# SPECIFIC REMOVE +#================================================= +# REMOVE THE CRON FILE +#================================================= +ynh_script_progression --message="Removing the cron file..." + +# Remove a cron file +ynh_secure_remove --file="/etc/cron.d/$app" + #================================================= # REMOVE LOGROTATE CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 5984393..91d0b4b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -102,6 +102,13 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +#================================================= +# RESTORE THE CRON FILE +#================================================= +ynh_script_progression --message="Restoring the cron file..." + +ynh_restore_file --origin_path="/etc/cron.d/$app" + #================================================= # RESTORE THE LOGROTATE CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2cf47d0..01dc19a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -201,18 +201,14 @@ ynh_script_progression --message="Deploying..." pushd "$final_path" - php$phpversion artisan migrate:refresh --seed + rm -rf bootstrap/cache/* + php$phpversion artisan cache:clear + php$phpversion artisan migrate --seed php$phpversion artisan firefly-iii:upgrade-database php$phpversion artisan passport:install php$phpversion artisan cache:clear - #rm -rf "$final_path/bootstrap/cache/*" - #php$phpversion artisan cache:clear - #php$phpversion artisan migrate --seed - #php$phpversion artisan firefly-iii:upgrade-database - #php$phpversion artisan passport:install - #php$phpversion artisan cache:clear popd #================================================= @@ -234,6 +230,17 @@ ynh_script_progression --message="Securing files and directories..." chown -R $app: $final_path chmod -R 775 ${final_path}/storage +#================================================= +# SETUP A CRON +#================================================= +ynh_script_progression --message="Setuping a cron..." + +cp ../conf/cron /etc/cron.d/$app + +ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="/etc/cron.d/$app" +ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/cron.d/$app" +ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion" --target_file="/etc/cron.d/$app" + #================================================= # SETUP SSOWAT #================================================= From c50b52a7fefc9cbfbb4897660685b18978fa6308 Mon Sep 17 00:00:00 2001 From: anmol26s Date: Sun, 7 Feb 2021 23:18:45 +0530 Subject: [PATCH 2/2] Added hash in checks --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 43d9545..4252eb8 100644 --- a/check_process +++ b/check_process @@ -17,7 +17,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=66140e9d21f8d9e07074b5bded213265b06819d5 + upgrade=1 from_commit=231c5e281e9cafabd35d4a6ef3c27fec6f3c470f backup_restore=1 multi_instance=1 port_already_use=0