From 99c1d4a39152fe72e6f5fe4377972df94fb2569a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 5 Jun 2023 10:49:39 +0000 Subject: [PATCH 1/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f133077..42deb34 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Actual is a local-first personal finance tool. It is 100% free and open-source, ## Documentation and resources * Official admin documentation: -* Upstream app code repository: +* Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/README_fr.md b/README_fr.md index 98b079a..e1c6c91 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ Actual is a local-first personal finance tool. It is 100% free and open-source, ## Documentations et ressources * Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : From d8f3a76bcb3e58e1552e0411cec825a7d3ad81e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 12:50:20 +0200 Subject: [PATCH 2/5] Update DESCRIPTION_fr.md --- doc/DESCRIPTION_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index a15c122..9eb4b86 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -Actual is a local-first personal finance tool. It is 100% free and open-source, written in NodeJS, it has a synchronization element so that all your changes can move between devices without any heavy lifting. \ No newline at end of file +Actual est un outil de finances personnelles local. Il est 100% gratuit et open-source, écrit en NodeJS, il dispose d'un élément de synchronisation afin que toutes vos modifications puissent se déplacer entre les appareils sans aucune lourde charge. \ No newline at end of file From 17ca004af7ea3032dfc6e859a0d7d1849f1a51f1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 5 Jun 2023 10:50:29 +0000 Subject: [PATCH 3/5] Auto-update README --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index e1c6c91..06e930e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Actual is a local-first personal finance tool. It is 100% free and open-source, written in NodeJS, it has a synchronization element so that all your changes can move between devices without any heavy lifting. +Actual est un outil de finances personnelles local. Il est 100% gratuit et open-source, écrit en NodeJS, il dispose d'un élément de synchronisation afin que toutes vos modifications puissent se déplacer entre les appareils sans aucune lourde charge. **Version incluse :** 23.6.0~ynh1 From ec71cd3667f56c01d8120d2daf74d60bc2116607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 13:18:14 +0200 Subject: [PATCH 4/5] fix --- scripts/install | 6 +++--- scripts/upgrade | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index c57f757..163fe27 100755 --- a/scripts/install +++ b/scripts/install @@ -48,10 +48,10 @@ yunohost service add $app --description="Local-first personal finance tool" --lo #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json" -chmod 400 "$install_dir/.env" -chown $app:$app "$install_dir/.env" +chmod 400 "$install_dir/config.json" +chown $app:$app "$install_dir/config.json" #================================================= # INSTALL THE LOUNGE diff --git a/scripts/upgrade b/scripts/upgrade index db78065..6e6819f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,7 +16,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) @@ -29,7 +29,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep=".env" + ynh_setup_source --dest_dir="$install_dir" --keep="config.json" fi chown -R $app:www-data "$install_dir" From a6bbd3818ffe6cabab5632ab245e03f74a0c2805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:24:28 +0200 Subject: [PATCH 5/5] Delete .env --- conf/.env | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 conf/.env diff --git a/conf/.env b/conf/.env deleted file mode 100644 index 4632967..0000000 --- a/conf/.env +++ /dev/null @@ -1,5 +0,0 @@ -ACTUAL_CONFIG_PATH=__DATA_DIR__ -ACTUAL_PORT=__PORT__ -ACTUAL_HOSTNAME= -ACTUAL_SERVER_FILES=__DATA_DIR__/server-files -ACTUAL_USER_FILES=__DATA_DIR__/user-files \ No newline at end of file