From 810b06a6a451a0b86250f23140851816af0b4506 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 1 Jun 2022 05:59:04 +0000 Subject: [PATCH 1/4] Auto-update README --- README.md | 17 +++++++++-------- README_fr.md | 23 ++++++++++++++--------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 5cf21a8..32c4831 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # 2FAuth for YunoHost -[![Integration level](https://dash.yunohost.org/integration/2fauth.svg)](https://dash.yunohost.org/appci/app/2fauth) ![](https://ci-apps.yunohost.org/ci/badges/2fauth.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/2fauth.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/2fauth.svg)](https://dash.yunohost.org/appci/app/2fauth) ![Working status](https://ci-apps.yunohost.org/ci/badges/2fauth.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/2fauth.maintain.svg) [![Install 2FAuth with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=2fauth) *[Lire ce readme en français.](./README_fr.md)* @@ -33,7 +33,7 @@ It aims to ease you perform your 2FA authentication steps whatever the device yo ## Screenshots -![](./doc/screenshots/screenshot.png) +![Screenshot of 2FAuth](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -43,20 +43,21 @@ You have to create a user account to use the app and you cannot create more than Authentication documentation: https://docs.2fauth.app/security/authentication/ ## Documentation and resources -* Official admin documentation: https://docs.2fauth.app/ -* Upstream app code repository: https://github.com/Bubka/2FAuth -* YunoHost documentation for this app: https://yunohost.org/app_2fauth -* Report a bug: https://github.com/YunoHost-Apps/2fauth_ynh/issues +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing --debug or sudo yunohost app upgrade 2fauth -u https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index d23d9a2..1b5ea53 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # 2FAuth pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/2fauth.svg)](https://dash.yunohost.org/appci/app/2fauth) ![](https://ci-apps.yunohost.org/ci/badges/2fauth.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/2fauth.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/2fauth.svg)](https://dash.yunohost.org/appci/app/2fauth) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/2fauth.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/2fauth.maintain.svg) [![Installer 2FAuth avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=2fauth) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer 2FAuth rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -29,7 +33,7 @@ It aims to ease you perform your 2FA authentication steps whatever the device yo ## Captures d'écran -![](./doc/screenshots/screenshot.png) +![Capture d'écran de 2FAuth](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -39,20 +43,21 @@ You have to create a user account to use the app and you cannot create more than Authentication documentation: https://docs.2fauth.app/security/authentication/ ## Documentations et ressources -* Documentation officielle de l'admin : https://docs.2fauth.app/ -* Dépôt de code officiel de l'app : https://github.com/Bubka/2FAuth -* Documentation YunoHost pour cette app : https://yunohost.org/app_2fauth -* Signaler un bug : https://github.com/YunoHost-Apps/2fauth_ynh/issues +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing --debug ou sudo yunohost app upgrade 2fauth -u https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From f954698ebca55601e6b7a2a812bd96ae62b9240a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 1 Jun 2022 08:00:15 +0200 Subject: [PATCH 2/4] 3.1.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 77c748f..3f95544 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Bubka/2FAuth/archive/refs/tags/v3.1.0.tar.gz -SOURCE_SUM=98dbabc102b046f41e63c2a4afcbd506f9a19bbfe7ef993a0710ffa990d84d7e +SOURCE_URL=https://github.com/Bubka/2FAuth/archive/refs/tags/v3.1.1.tar.gz +SOURCE_SUM=8dc50cfd719d690bdb409583633087f35f980a04b7047dca7a52f113121bd857 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e6bf55c..b331cea 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "self-hosted alternative to One Time Passcode", "fr": "Alternative auto-hébergée a One Time Passcode" }, - "version": "3.1.0~ynh1", + "version": "3.1.1~ynh1", "url": "https://github.com/Bubka/2FAuth", "upstream": { "license": "AGPL-3.0", From fdf64fc157132376f319d23198f1cadcf02c80cd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 1 Jun 2022 06:01:05 +0000 Subject: [PATCH 3/4] 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 32c4831..6968958 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,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:** 3.1.0~ynh1 +**Shipped version:** 3.1.1~ynh1 **Demo:** https://demo.2fauth.app/login diff --git a/README_fr.md b/README_fr.md index 1b5ea53..1641b34 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,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 :** 3.1.0~ynh1 +**Version incluse :** 3.1.1~ynh1 **Démo :** https://demo.2fauth.app/login From 6199ec901b67ebd0f4e634111a45037bb5e9223e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 1 Jun 2022 18:15:28 +0200 Subject: [PATCH 4/4] Update nginx.conf --- conf/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 080dd5d..1033459 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,7 +1,7 @@ location / { # Path to source - alias __FINALPATH__/public/; + root __FINALPATH__/public/; index index.php; @@ -14,7 +14,7 @@ location / { error_page 404 /index.php; - try_files $uri $uri/ /index.php; + try_files $uri $uri/ /index.php?$query_string; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$;