From 1598200f9e3e65234da16af3940fd843af7adf54 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 25 Jun 2024 03:34:40 +0200 Subject: [PATCH 1/6] Upgrade to v1.5.2 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8c224a8..316f0cf 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 = [] @@ -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] From d6d58b3fcba52d7b1fa6ea7f709d29bf4d248250 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 25 Jun 2024 01:34:43 +0000 Subject: [PATCH 2/6] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8bf7dc8..f752e47 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ 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 +**Shipped version:** 1.5.2~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index 917cc55..8f7b446 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ 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. -**Versión actual:** 1.2.2~ynh1 +**Versión actual:** 1.5.2~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index a1b853e..9e54a6d 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ 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. -**Paketatutako bertsioa:** 1.2.2~ynh1 +**Paketatutako bertsioa:** 1.5.2~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 93aa9b0..7ae5028 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ 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. -**Version incluse :** 1.2.2~ynh1 +**Version incluse :** 1.5.2~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 2b64a7c..5729eea 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ 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. -**Versión proporcionada:** 1.2.2~ynh1 +**Versión proporcionada:** 1.5.2~ynh1 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a6f2b62..de008b4 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ 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. -**分发版本：** 1.2.2~ynh1 +**分发版本：** 1.5.2~ynh1 ## 截图 From 72e111788e02fa4d8594c195db9823fcc2db4b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Wed, 10 Jul 2024 18:06:24 +0200 Subject: [PATCH 3/6] Bump php to 8.3 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 316f0cf..c10821d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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" From 33427a79c41d3d1267614a2eb7422f559b95c2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Wed, 10 Jul 2024 18:18:45 +0200 Subject: [PATCH 4/6] Cleanup, coding style --- manifest.toml | 15 ++++++++---- scripts/backup | 14 +---------- scripts/change_url | 19 ++++----------- scripts/install | 58 ++++++++++++++++++---------------------------- scripts/remove | 11 ++------- scripts/restore | 22 ++++++------------ scripts/upgrade | 55 ++++++++++++++----------------------------- tests.toml | 2 ++ 8 files changed, 66 insertions(+), 130 deletions(-) diff --git a/manifest.toml b/manifest.toml index c10821d..d670e06 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json + packaging_format = 2 id = "firefly-iii-di" @@ -41,10 +43,10 @@ ram.runtime = "50M" type = "user" [resources] - [resources.sources.main] - url = "https://github.com/firefly-iii/data-importer/archive/refs/tags/v1.5.2.tar.gz" - sha256 = "ee1debfe137c04e4152bf7ebb6bb50cbd6c4ab2d7dd64bee05b93f7e6c25f7d7" - autoupdate.strategy = "latest_github_tag" + [resources.sources.main] + 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 +56,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.3-xml php8.3-bcmath" + packages = [ + "php8.3-xml", + "php8.3-bcmath", + ] diff --git a/scripts/backup b/scripts/backup index db124c0..ed0aadc 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -22,23 +20,13 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# BACKUP THE SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - 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..c89b2cb 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC STARTING #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -9,15 +7,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= - -email=$(ynh_user_get_info --username=$admin --key=mail) -timezone="$(cat /etc/timezone)" - -#================================================= -# STANDARD MODIFICATIONS #================================================= # MODIFY URL IN NGINX CONF #================================================= @@ -30,12 +19,12 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Modifying a config file..." -domain="$new_domain" -path="$new_path" +email=$(ynh_user_get_info --username="$admin" --key="mail") +timezone="$(cat /etc/timezone)" -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" +chown "$app" "$install_dir/.env" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 0444f81..893c5cd 100755 --- a/scripts/install +++ b/scripts/install @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -10,25 +8,21 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST +# INITIALIZE AND STORE SETTINGS #================================================= random_key=$(ynh_string_random --length=32) -email=$(ynh_user_get_info --username=$admin --key=mail) +ynh_app_setting_set --app="$app" --key="random_key" --value="$random_key" + +email=$(ynh_user_get_info --username="$admin" --key="mail") timezone="$(cat /etc/timezone)" fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= - -ynh_app_setting_set --app=$app --key=random_key --value=$random_key -ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage +ynh_app_setting_set --app="$app" --key="fpm_footprint" --value="$fpm_footprint" +ynh_app_setting_set --app="$app" --key="fpm_free_footprint" --value="$fpm_free_footprint" +ynh_app_setting_set --app="$app" --key="fpm_usage" --value="$fpm_usage" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -39,27 +33,9 @@ ynh_script_progression --message="Setting up source files..." ynh_setup_source --dest_dir=$install_dir chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" -chmod -R 775 $install_dir/storage +chown -R "$app:www-data" "$install_dir" +chmod -R 775 "$install_dir/storage" -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -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 - -#================================================= -# SPECIFIC SETUP #================================================= # INSTALL COMPOSER DEPENDENCIES #================================================= @@ -72,10 +48,20 @@ 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" +chown "$app" "$install_dir/.env" + +#================================================= +# SYSTEM CONFIGURATION +#================================================= +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 + +# Create a dedicated PHP-FPM config +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint + +# Create a dedicated NGINX config +ynh_add_nginx_config #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index c9f5356..52b7893 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -10,18 +8,13 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # 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..43e5e34 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -18,30 +16,24 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= -# RESTORE THE PHP-FPM CONFIGURATION +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 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" #================================================= -# GENERIC FINALIZATION +# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE #================================================= -# RELOAD NGINX AND PHP-FPM -#================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." +ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 + +ynh_systemd_action --service_name="php$phpversion-fpm" --action=reload -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0e0721e..ac2cdcd 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -16,12 +14,6 @@ source /usr/share/yunohost/helpers email=$(ynh_user_get_info --username=$admin --key=mail) timezone="$(cat /etc/timezone)" -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -48,43 +40,32 @@ fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep=".env storage/upload storage/export" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --keep=".env storage/upload storage/export" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" -chmod -R 775 $install_dir/storage +chown -R "$app:www-data" "$install_dir" +chmod -R 775 "$install_dir/storage" -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -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 - -#================================================= -# SPECIFIC UPGRADE #================================================= # UPDATE PHP DEPENDENCIES #================================================= -ynh_script_progression --message="Updating PHP dependencies..." +ynh_script_progression --message="Installing composer dependencies..." -ynh_exec_warn_less ynh_install_composer +ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir" + +#================================================= +# REAPPLY SYSTEM CONFIGURATIONS +#================================================= +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 + +# Create a dedicated PHP-FPM config +ynh_add_fpm_config --phpversion="$phpversion" --usage="$fpm_usage" --footprint="$fpm_footprint" + +# Create a dedicated NGINX config +ynh_add_nginx_config #================================================= # END OF SCRIPT diff --git a/tests.toml b/tests.toml index 65c744c..e5f98b5 100644 --- a/tests.toml +++ b/tests.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json + test_format = 1.0 [default] From 6999af71976a95b3ecf64be914776cfe19dd90da Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 10 Jul 2024 16:18:51 +0000 Subject: [PATCH 5/6] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f752e47..b9297d7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Firefly III Importer for YunoHost -[![Integration level](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://dash.yunohost.org/appci/app/firefly-iii-di) ![Working status](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://ci-apps.yunohost.org/ci/apps/firefly-iii-di/) ![Working status](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) [![Install Firefly III Importer with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii-di) diff --git a/README_es.md b/README_es.md index 8f7b446..1ad42d3 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Firefly III Importer para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://dash.yunohost.org/appci/app/firefly-iii-di) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://ci-apps.yunohost.org/ci/apps/firefly-iii-di/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) [![Instalar Firefly III Importer con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii-di) diff --git a/README_eu.md b/README_eu.md index 9e54a6d..d878b12 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Firefly III Importer YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://dash.yunohost.org/appci/app/firefly-iii-di) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://ci-apps.yunohost.org/ci/apps/firefly-iii-di/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) [![Instalatu Firefly III Importer YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii-di) diff --git a/README_fr.md b/README_fr.md index 7ae5028..81a8134 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Firefly III Importer pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://dash.yunohost.org/appci/app/firefly-iii-di) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://ci-apps.yunohost.org/ci/apps/firefly-iii-di/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) [![Installer Firefly III Importer avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii-di) diff --git a/README_gl.md b/README_gl.md index 5729eea..c2f2236 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Firefly III Importer para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://dash.yunohost.org/appci/app/firefly-iii-di) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://ci-apps.yunohost.org/ci/apps/firefly-iii-di/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) [![Instalar Firefly III Importer con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii-di) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index de008b4..5d17981 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Firefly III Importer -[![集成程度](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://dash.yunohost.org/appci/app/firefly-iii-di) ![工作状态](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/firefly-iii-di.svg)](https://ci-apps.yunohost.org/ci/apps/firefly-iii-di/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/firefly-iii-di.maintain.svg) [![使用 YunoHost 安装 Firefly III Importer](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii-di) From 660703ed85934f5ad9c0038b5462e916e669e526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Wed, 10 Jul 2024 18:59:37 +0200 Subject: [PATCH 6/6] Update .env --- conf/.env | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/conf/.env b/conf/.env index e97e9b8..5892841 100644 --- a/conf/.env +++ b/conf/.env @@ -84,6 +84,14 @@ USE_CACHE=false # IGNORE_DUPLICATE_ERRORS=false +# +# If you set this to true, the importer will not complain about transactions that can't be found after they've +# been imported. This happens when rule on the Firefly III side deletes the transaction immediately after creating it. +# This can be useful when you have a rule that immediately deletes GoCardless' "pending" transactions. Setting this +# to true reduces some noise. +# +IGNORE_NOT_FOUND_TRANSACTIONS=false + # # Auto import settings. Due to security constraints, you MUST enable each feature individually. # You must also set a secret. The secret is used for the web routes. @@ -116,6 +124,16 @@ CAN_POST_FILES=false # IMPORT_DIR_ALLOWLIST= +# +# If you import from a directory, you can save a fallback configuration file in the directory. +# This file must be called "_fallback.json" and will be used when your CSV or CAMT.053 file is not accompanied +# by a configuration file. +# +# This fallback configuration will only be used if this variable is set to true. +# https://docs.firefly-iii.org/how-to/data-importer/advanced/post/#importing-a-local-directory +# +FALLBACK_IN_DIR=false + # # When you're running Firefly III under a (self-signed) certificate, # the data importer may have trouble verifying the TLS connection. @@ -147,6 +165,11 @@ APP_ENV=local APP_DEBUG=false LOG_CHANNEL=stack +# +# If you turn this on, expect massive logs with lots of privacy sensitive data +# +LOG_RETURN_JSON=false + # Log level. You can set this from least severe to most severe: # debug, info, notice, warning, error, critical, alert, emergency # If you set it to debug your logs will grow large, and fast. If you set it to emergency probably @@ -155,18 +178,13 @@ LOG_LEVEL=notice # TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy. # Set it to ** and reverse proxies work just fine. -TRUSTED_PROXIES=* +TRUSTED_PROXIES=** # # Time zone # TZ=Europe/Amsterdam -# -# Use ASSET_URL when you're running the data importer in a sub-directory. -# -ASSET_URL=https://__DOMAIN____PATH__ - # # Email settings. # The data importer can send you a message with all errors, warnings and messages @@ -224,6 +242,16 @@ REDIS_PORT=6379 REDIS_DB="0" REDIS_CACHE_DB="1" +# +# Use ASSET_URL when your data importer webpages are served from a URL with a subfolder path +# This pre-appends the subfolder path in front of URLs for browser-side assets such as CSS Files. +# Example: If your webserver (i.e. NGINX) is configured to serve the data importer webpages from +# http://localhost/ff3di, set ASSET_URL = /ff3di +# and it will pre-append that value to any requests for browser-side assets +# 1) Make sure you REMOVE any trailing slash from the end of the URL. +# +ASSET_URL=__PATH__ + # The only tracker supported is Matomo. # This is used on the public instance over at https://data-importer.firefly-iii.org TRACKER_SITE_ID= @@ -238,4 +266,3 @@ APP_NAME=DataImporter # Laravel uses this to generate links on the command line, which is a feature the data importer does not use. # APP_URL=https://__DOMAIN____PATH__ -