diff --git a/README.md b/README.md index 299477f..95df861 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,10 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Firefly III Data Importer is the nr. 1 tool to import data into [Firefly III](https://www.firefly-iii.org/). This tools helps you import transactions from files or bank APIs into your -Firefly-III server. Please follow the documentation at https://docs.firefly-iii.org/data-importer/. +Firefly III Data Importer is the nr. 1 tool to import data into [Firefly III](https://www.firefly-liii.org/). +This tools helps you import transactions from files or bank APIs into your Firefly-III server. +The following two links will take you to the official documentation: [installation](https://docs.firefly-iii.org/how-to/data-importer/installation/self-managed/), [configuration](https://docs.firefly-iii.org/how-to/data-importer/how-to-configure/) and [upgrade](https://docs.firefly-iii.org/how-to/data-importer/upgrade/self-managed/). + If your Firefly-III server is installed as a YunoHost app, please note: @@ -25,17 +27,14 @@ If your Firefly-III server is installed as a YunoHost app, please note: - When configuring the Data Importer, use the public Firefly-III domain and path, not *localhost*, even if both services are on the same machine. - -**Shipped version:** 1.2.2~ynh1 - ## Screenshots ![Screenshot of Firefly III Importer](./doc/screenshots/firefly-iii-di-start-screen.png) ## Documentation and resources -* Official app website: -* Official admin documentation: +* Official app website: +* Official admin documentation: * Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/manifest.toml b/manifest.toml index 8c224a8..f811c3a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Firefly III Importer" description.en = "Firefly III Data Importer" description.fr = "Importateur de données Firefly III" -version = "1.2.2~ynh1" +version = "1.5.2~ynh1" maintainers = [] @@ -16,7 +16,7 @@ admindoc = "https://docs.firefly-iii.org/data-importer/how-to-use/" code = "https://github.com/firefly-iii/data-importer" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/firefly-iii/data-importer/archive/refs/tags/v1.2.2.tar.gz" - sha256 = "2e69f8b68ab8fd0f078e585feb2128b99bf2dd3088c057d2dbd1c75a20860732" + url = "https://github.com/firefly-iii/data-importer/archive/refs/tags/v1.5.2.tar.gz" + sha256 = "ee1debfe137c04e4152bf7ebb6bb50cbd6c4ab2d7dd64bee05b93f7e6c25f7d7" autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -54,4 +54,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.2-xml php8.2-bcmath" + packages = "php8.3-xml, php8.3-bcmath" diff --git a/scripts/_common.sh b/scripts/_common.sh index 1a7049a..a677a90 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,6 +4,9 @@ # COMMON VARIABLES #================================================= +# PHP version required by FIII Data Importer +YNH_PHP_VERSION="8.3" + # Composer version YNH_COMPOSER_VERSION="2.5.4" diff --git a/scripts/backup b/scripts/backup index db124c0..18f83fe 100755 --- a/scripts/backup +++ b/scripts/backup @@ -33,12 +33,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# BACKUP VARIOUS FILES -#================================================= - -# ynh_backup --src_path="/etc/cron.d/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/change_url b/scripts/change_url index 1fbf84a..76d298b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -33,7 +33,7 @@ ynh_script_progression --message="Modifying a config file..." domain="$new_domain" path="$new_path" -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app "$install_dir/.env" diff --git a/scripts/install b/scripts/install index 0444f81..f6aafa3 100755 --- a/scripts/install +++ b/scripts/install @@ -50,11 +50,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." - # Create a dedicated NGINX config ynh_add_nginx_config @@ -72,7 +67,7 @@ ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$i #================================================= ynh_script_progression --message="Adding a configuration file..." -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app "$install_dir/.env" diff --git a/scripts/remove b/scripts/remove index c9f5356..2c04d62 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index afa45cb..72e44fb 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,11 +27,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0e0721e..07f7e77 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,11 +69,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config