YunoHost-Apps/firefly-iii_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/firefly-iii_ynh.git synced 2024-09-03 18:36:13 +02:00
Code Issues Activity Actions

Merge pull request #44 from YunoHost-Apps/patch

Browse source 
5.5.11
This commit is contained in:
Éric Gaspar 2021-07-23 23:47:16 +02:00 committed by GitHub
commit c1e7b09df0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 101 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -15,20 +15,22 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
## Overview ## Overview
Self-hosted financial manager. Self-hosted financial manager
**Shipped version:** 5.5.11~ynh2 **Shipped version:** 5.5.12~ynh1
**Demo:** https://demo.firefly-iii.org/login **Demo:** https://demo.firefly-iii.org/login
## Screenshots ## Screenshots
![](./doc/screenshots/budget.png) ![](./doc/screenshots/budget.png)
![](./doc/screenshots/ff2.png)
## Documentation and resources ## Documentation and resources
* Official app website: https://firefly-iii.org/ * Official app website: https://firefly-iii.org/
* Official admin documentation: https://docs.firefly-iii.org/ * Official user documentation: https://yunohost.org/apps
* 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 * Upstream app code repository: https://github.com/firefly-iii/firefly-iii
* YunoHost documentation for this app: https://yunohost.org/app_firefly-iii * YunoHost documentation for this app: https://yunohost.org/app_firefly-iii
* Report a bug: https://github.com/YunoHost-Apps/firefly-iii_ynh/issues * Report a bug: https://github.com/YunoHost-Apps/firefly-iii_ynh/issues

8
README_fr.md
View file

@ -11,20 +11,22 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
## Vue d'ensemble ## Vue d'ensemble
Gestionnaire de finances personnelles. Gestionnaire de finances personnelles
**Version incluse :** 5.5.11~ynh2 **Version incluse :** 5.5.12~ynh1
**Démo :** https://demo.firefly-iii.org/login **Démo :** https://demo.firefly-iii.org/login
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/budget.png) ![](./doc/screenshots/budget.png)
![](./doc/screenshots/ff2.png)
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : https://firefly-iii.org/ * Site officiel de l'app : https://firefly-iii.org/
* Documentation officielle de l'admin : https://docs.firefly-iii.org/ * Documentation officielle utilisateur : https://yunohost.org/apps
* 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 * 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 * Documentation YunoHost pour cette app : https://yunohost.org/app_firefly-iii
* Signaler un bug : https://github.com/YunoHost-Apps/firefly-iii_ynh/issues * Signaler un bug : https://github.com/YunoHost-Apps/firefly-iii_ynh/issues

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/firefly-iii/firefly-iii/archive/refs/tags/5.5.11.tar.gz SOURCE_URL=https://github.com/firefly-iii/firefly-iii/archive/refs/tags/5.5.12.tar.gz
SOURCE_SUM=f98c28a8fa6800ce0f6a92e6de0ce4e58d363972590010fac736163fbf166983 SOURCE_SUM=9a7d6bc2654ffb2073edae9545b5eff0755ad8241bf4abfca80ff978e5b02240
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

BIN
doc/screenshots/ff2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

11
manifest.json
View file

@ -3,16 +3,17 @@
"id": "firefly-iii", "id": "firefly-iii",
"packaging_format": 1, "packaging_format": 1,
"description": { "description": {
"en": "Self-hosted financial manager.", "en": "Self-hosted financial manager",
"fr": "Gestionnaire de finances personnelles." "fr": "Gestionnaire de finances personnelles"
}, },
"version": "5.5.11~ynh2", "version": "5.5.12~ynh1",
"url": "https://firefly-iii.org/", "url": "https://firefly-iii.org/",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"website": "https://firefly-iii.org/", "website": "https://firefly-iii.org/",
"demo": "https://demo.firefly-iii.org/login", "demo": "https://demo.firefly-iii.org/login",
"admindoc": "https://docs.firefly-iii.org/", "admindoc": "https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/introduction/",
"userdoc": "https://yunohost.org/apps",
"code": "https://github.com/firefly-iii/firefly-iii" "code": "https://github.com/firefly-iii/firefly-iii"
}, },
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
@ -22,7 +23,7 @@
"url": "https://datamol.org" "url": "https://datamol.org"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.0" "yunohost": ">= 4.2.4"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [

3
scripts/_common.sh
View file

@ -13,6 +13,9 @@ pkg_dependencies="redis-server"
YNH_PHP_VERSION="7.4" YNH_PHP_VERSION="7.4"
# Composer version
YNH_COMPOSER_VERSION="2.0.13"
extra_php_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-ldap" extra_php_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-ldap"
# Composer version # Composer version

13
scripts/install
View file

@ -48,7 +48,6 @@ ynh_script_progression --message="Storing installation settings..."
ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=admin --value=$admin
ynh_app_setting_set --app=$app --key=is_public --value=$is_public
ynh_app_setting_set --app=$app --key=random_key --value=$random_key ynh_app_setting_set --app=$app --key=random_key --value=$random_key
ynh_app_setting_set --app=$app --key=update --value=$update ynh_app_setting_set --app=$app --key=update --value=$update
@ -59,6 +58,14 @@ ynh_script_progression --message="Installing dependencies..."
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
#=================================================
# CREATE DEDICATED USER
#=================================================
ynh_script_progression --message="Configuring system user..."
# Create a system user
ynh_system_user_create --username=$app --home_dir="$final_path"
#================================================= #=================================================
# CREATE A MYSQL DATABASE # CREATE A MYSQL DATABASE
#================================================= #=================================================
@ -89,6 +96,7 @@ git clone -b $tag --depth 1 https://github.com/firefly-iii/firefly-iii.git $fina
chmod 750 "$final_path" chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
chmod -R 775 $final_path/storage
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
@ -122,7 +130,6 @@ ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$f
ynh_script_progression --message="Modifying a config file..." ynh_script_progression --message="Modifying a config file..."
ynh_add_config --template="../conf/.env" --destination="$final_path/.env" ynh_add_config --template="../conf/.env" --destination="$final_path/.env"
chmod 400 "$final_path/.env" chmod 400 "$final_path/.env"
chown $app "$final_path/.env" chown $app "$final_path/.env"
@ -143,6 +150,8 @@ popd
ynh_script_progression --message="Setuping a cron..." ynh_script_progression --message="Setuping a cron..."
ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
chown root: "/etc/cron.d/$app"
chmod 644 "/etc/cron.d/$app"
#================================================= #=================================================
# SETUP LOGROTATE # SETUP LOGROTATE

33
scripts/upgrade
View file

@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path) path_url=$(ynh_app_setting_get --app=$app --key=path)
admin=$(ynh_app_setting_get --app=$app --key=admin) admin=$(ynh_app_setting_get --app=$app --key=admin)
is_public=$(ynh_app_setting_get --app=$app --key=is_public)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_name=$(ynh_app_setting_get --app=$app --key=db_name)
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
@ -34,6 +33,20 @@ ynh_script_progression --message="Checking version..."
upgrade_type=$(ynh_check_app_version_changed) upgrade_type=$(ynh_check_app_version_changed)
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
# Backup the current version of the app
ynh_backup_before_upgrade
ynh_clean_setup () {
# Restore it if the upgrade fails
ynh_restore_upgradebackup
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#================================================= #=================================================
# ENSURE DOWNWARD COMPATIBILITY # ENSURE DOWNWARD COMPATIBILITY
#================================================= #=================================================
@ -58,20 +71,6 @@ if ynh_legacy_permissions_exists; then
ynh_app_setting_delete --app=$app --key=is_public ynh_app_setting_delete --app=$app --key=is_public
fi fi
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
# Backup the current version of the app
ynh_backup_before_upgrade
ynh_clean_setup () {
# restore it if the upgrade fails
ynh_restore_upgradebackup
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#================================================= #=================================================
# CREATE DEDICATED USER # CREATE DEDICATED USER
#================================================= #=================================================
@ -143,6 +142,7 @@ fi
chmod 750 "$final_path" chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
chmod -R 775 $final_path/storage
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
@ -175,6 +175,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
ynh_script_progression --message="Updating PHP dependencies..." ynh_script_progression --message="Updating PHP dependencies..."
chown -R $app $final_path
ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
#================================================= #=================================================
@ -215,6 +216,8 @@ ynh_use_logrotate --non-append
ynh_script_progression --message="Setuping a cron..." ynh_script_progression --message="Setuping a cron..."
ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
chown root: "/etc/cron.d/$app"
chmod 644 "/etc/cron.d/$app"
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX