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 #=================================================