From 7a85e6deba92849deaf16a8694e6a7b3e6f7eedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 Jan 2024 23:08:51 +0100 Subject: [PATCH 1/4] Update manifest.toml --- manifest.toml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7176499..e2ae28f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Firefly III" description.en = "Self-hosted financial manager" description.fr = "Gestionnaire de finances personnelles" -version = "6.0.20~ynh1" +version = "6.1.4~ynh1" maintainers = [] @@ -20,8 +20,11 @@ code = "https://github.com/firefly-iii/firefly-iii" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "200M" ram.runtime = "50M" @@ -52,8 +55,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.0.20.tar.gz" - sha256 = "ea21f4c13ab932094a9be9de6b1988d034b802c589418b6dbd325004ab622f31" + url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.1.4.tar.gz" + sha256 = "69df1131e25a1dab67fc8c48097478503f53da6d7011c7c6e913773a5b2c9418" autoupdate.strategy = "latest_github_tag" autoupdate.asset = "tarball" @@ -65,7 +68,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php8.2-zip php8.2-mysql php8.2-xml php8.2-intl php8.2-mbstring php8.2-gd php8.2-curl php8.2-bcmath php8.2-opcache php8.2-ldap" + packages = "mariadb-server, php8.2-zip, php8.2-mysql, php8.2-xml, php8.2-intl, php8.2-mbstring php8.2-gd, php8.2-curl, php8.2-bcmath, php8.2-opcache, php8.2-ldap" [resources.database] type = "mysql" From 8a21a7219d1063265ad42f6a5f868bdfb279a4b6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 2 Jan 2024 22:08:56 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1c196d9..2a781b7 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available. -**Shipped version:** 6.0.20~ynh1 +**Shipped version:** 6.1.4~ynh1 **Demo:** https://demo.firefly-iii.org/login @@ -32,7 +32,7 @@ Firefly III is a manager for your personal finances. It can help you keep track * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index d2cfc19..99a2e60 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'outils externes: [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles. -**Version incluse :** 6.0.20~ynh1 +**Version incluse :** 6.1.4~ynh1 **Démo :** https://demo.firefly-iii.org/login @@ -31,7 +31,7 @@ Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous a * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 9283a4e48ff17198220fb3c6c832a7a87c5834c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 Jan 2024 23:10:45 +0100 Subject: [PATCH 3/4] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e2ae28f..39318e4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,7 +46,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" choices = ["de_DE", "en_US", "es_ES", "fr_FR", "it_IT", "nl_NL", "pt_PT"] default = "fr_FR" From c63efea33fbe23441c6d7c79cf442cc1efa7960c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 Jan 2024 23:13:36 +0100 Subject: [PATCH 4/4] cleaning --- scripts/install | 7 ++----- scripts/remove | 14 -------------- scripts/restore | 22 ++++++---------------- scripts/upgrade | 14 +++----------- 4 files changed, 11 insertions(+), 46 deletions(-) diff --git a/scripts/install b/scripts/install index 785553a..e4cd513 100755 --- a/scripts/install +++ b/scripts/install @@ -35,7 +35,6 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage #================================================= ynh_script_progression --message="Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$install_dir chmod -R o-rwx "$install_dir" @@ -47,10 +46,8 @@ chmod -R 775 $install_dir/storage #================================================= ynh_script_progression --message="Configuring PHP-FPM..." -# 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 #================================================= @@ -67,7 +64,7 @@ ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$inst #================================================= 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" @@ -95,7 +92,7 @@ popd #================================================= ynh_script_progression --message="Setuping a cron..." -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/remove b/scripts/remove index 76dc342..6a67d42 100755 --- a/scripts/remove +++ b/scripts/remove @@ -14,24 +14,10 @@ source /usr/share/yunohost/helpers #================================================= 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 -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." - # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" diff --git a/scripts/restore b/scripts/restore index 5749a98..33d4b55 100755 --- a/scripts/restore +++ b/scripts/restore @@ -20,20 +20,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -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" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -42,9 +28,13 @@ ynh_script_progression --message="Restoring the MySQL database..." ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= -# RESTORE VARIOUS FILES +# RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring various files..." +ynh_script_progression --message="Restoring the PHP-FPM configuration..." + +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" ynh_restore_file --origin_path="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 2b5b30d..78dfd26 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,7 +53,6 @@ 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 @@ -66,15 +65,8 @@ chmod -R 775 $install_dir/storage #================================================= 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 +ynh_add_fpm_config --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 #================================================= @@ -91,7 +83,7 @@ ynh_exec_warn_less ynh_install_composer #================================================= # ynh_script_progression --message="Updating 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" @@ -115,7 +107,7 @@ popd #================================================= ynh_script_progression --message="Setuping a cron..." -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app"