mirror of
https://github.com/YunoHost-Apps/firefly-iii_ynh.git
synced 2024-09-03 18:36:13 +02:00
Merge branch 'testing' of https://github.com/YunoHost-Apps/firefly-iii_ynh into testing
This commit is contained in:
ericgaspar
commit
a8861c38be
7 changed files with 22 additions and 54 deletions
|
|
@ -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: <https://firefly-iii.org/>
|
||||
* Official admin documentation: <https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/introduction/>
|
||||
* Upstream app code repository: <https://github.com/firefly-iii/firefly-iii>
|
||||
* YunoHost documentation for this app: <https://yunohost.org/app_firefly-iii>
|
||||
* YunoHost Store: <https://apps.yunohost.org/app/firefly-iii>
|
||||
* Report a bug: <https://github.com/YunoHost-Apps/firefly-iii_ynh/issues>
|
||||
|
||||
## Developer info
|
||||
|
|
|
|||
|
|
@ -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 : <https://firefly-iii.org/>
|
||||
* Documentation officielle de l’admin : <https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/introduction/>
|
||||
* Dépôt de code officiel de l’app : <https://github.com/firefly-iii/firefly-iii>
|
||||
* Documentation YunoHost pour cette app : <https://yunohost.org/app_firefly-iii>
|
||||
* YunoHost Store: <https://apps.yunohost.org/app/firefly-iii>
|
||||
* Signaler un bug : <https://github.com/YunoHost-Apps/firefly-iii_ynh/issues>
|
||||
|
||||
## Informations pour les développeurs
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
@ -43,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"
|
||||
|
||||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue