From c248ae3568bea8ad7e3c500681663de95b2491f1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Aug 2023 09:57:30 +0200 Subject: [PATCH 1/2] preserve .envfile --- manifest.toml | 2 +- scripts/upgrade | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index e7ba6ee..a3194bf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "2FAuth" description.en = "self-hosted alternative to One Time Passcode" description.fr = "Alternative auto-hébergée a One Time Passcode" -version = "4.1.0~ynh2" +version = "4.1.0~ynh3" maintainers = ["eric_G"] diff --git a/scripts/upgrade b/scripts/upgrade index 1936140..4168359 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,7 +47,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="storage" + ynh_setup_source --dest_dir="$install_dir" --keep="storage .env" fi chown -R $app:www-data "$install_dir" @@ -66,15 +66,15 @@ ynh_add_nginx_config #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +#ynh_script_progression --message="Adding a configuration file..." --weight=1 -email=$(ynh_user_get_info --username=$admin --key=mail) +#email=$(ynh_user_get_info --username=$admin --key=mail) # Setup application config -ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" +#ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" -chmod 644 "$install_dir/.env" -chown $app:$app "$install_dir/.env" +#chmod 644 "$install_dir/.env" +#chown $app:$app "$install_dir/.env" #================================================= # INSTALL 2FAUTH WITH COMPOSER From 9864d4df6c9598fbe528f4c7cd4186b5fa74b295 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 24 Aug 2023 07:57:34 +0000 Subject: [PATCH 2/2] 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 6d9382b..80d6f8b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ It aims to ease you perform your 2FA authentication steps whatever the device yo - Edit accounts, even the imported ones - Generate TOTP and HOTP security codes -**Shipped version:** 4.1.0~ynh2 +**Shipped version:** 4.1.0~ynh3 **Demo:** https://demo.2fauth.app/login diff --git a/README_fr.md b/README_fr.md index 23f1b2d..eae1082 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ It aims to ease you perform your 2FA authentication steps whatever the device yo - Edit accounts, even the imported ones - Generate TOTP and HOTP security codes -**Version incluse :** 4.1.0~ynh2 +**Version incluse :** 4.1.0~ynh3 **Démo :** https://demo.2fauth.app/login