Merge pull request #141 from YunoHost-Apps/testing

Testing
Auto-update READMEs
2024-08-07 15:17:05 +02:00 · 2024-08-07 13:16:58 +00:00 · 2024-08-07 15:16:54 +02:00 · 2024-08-07 15:15:51 +02:00 · 2024-07-29 16:35:04 +02:00 · 2024-07-29 14:32:02 +00:00
27 changed files with 593 additions and 91 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -0,0 +1,9 @@
+# All available README files by language
+
+- [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
+- [Irakurri README euskaraz](README_eu.md)
+- [Lire le README en français](README_fr.md)
+- [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -1,44 +1,46 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
 It shall NOT be edited by hand.
 -->

 # My Webapp for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/my_webapp.svg)](https://dash.yunohost.org/appci/app/my_webapp) ![Working status](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/my_webapp.svg)](https://ci-apps.yunohost.org/ci/apps/my_webapp/) ![Working status](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)

 [![Install My Webapp with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=my_webapp)

-*[Lire ce readme en français.](./README_fr.md)*
+*[Read this README in other languages.](./ALL_README.md)*

-> *This package allows you to install My Webapp quickly and simply on a YunoHost server.
-If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
+> *This package allows you to install My Webapp quickly and simply on a YunoHost server.*  
+> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*

 ## Overview

 This application allows you to easily install a custom Web application, providing files access with [SFTP](https://yunohost.org/en/filezilla).

-It can also create a MySQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.
+It can also create a MySQL or PostgreSQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.

 PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2`.

 **Once installed, go to the chosen URL to know the user, domain and port you will have to use for the SFTP access.** The password is one you chosen during the installation. Under the Web directory, you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.

+You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. 

-**Shipped version:** 1.0~ynh15
+
+**Shipped version:** 1.0~ynh19
 ## Documentation and resources

-* Upstream app code repository: <https://github.com/YunoHost-Apps/my_webapp_ynh>
-* YunoHost documentation for this app: <https://yunohost.org/app_my_webapp>
-* Report a bug: <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>
+- Upstream app code repository: <https://github.com/YunoHost-Apps/my_webapp_ynh>
+- YunoHost Store: <https://apps.yunohost.org/app/my_webapp>
+- Report a bug: <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>

 ## Developer info

-Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing).
+Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing).

-To try the testing branch, please proceed like that.
+To try the `testing` branch, please proceed like that:

-``` bash
+```bash
 sudo yunohost app install https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade my_webapp -u https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
--- a/README_es.md
+++ b/README_es.md
@ -0,0 +1,49 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# My Webapp para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/my_webapp.svg)](https://ci-apps.yunohost.org/ci/apps/my_webapp/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)
+
+[![Instalar My Webapp con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=my_webapp)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarMy Webapp rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+This application allows you to easily install a custom Web application, providing files access with [SFTP](https://yunohost.org/en/filezilla).
+
+It can also create a MySQL or PostgreSQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.
+
+PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2`.
+
+**Once installed, go to the chosen URL to know the user, domain and port you will have to use for the SFTP access.** The password is one you chosen during the installation. Under the Web directory, you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.
+
+You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. 
+
+
+**Versión actual:** 1.0~ynh19
+## Documentaciones y recursos
+
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/YunoHost-Apps/my_webapp_ynh>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/my_webapp>
+- Reportar un error: <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade my_webapp -u https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>
--- a/README_eu.md
+++ b/README_eu.md
@ -0,0 +1,49 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# My Webapp YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/my_webapp.svg)](https://ci-apps.yunohost.org/ci/apps/my_webapp/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)
+
+[![Instalatu My Webapp YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=my_webapp)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek My Webapp YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+This application allows you to easily install a custom Web application, providing files access with [SFTP](https://yunohost.org/en/filezilla).
+
+It can also create a MySQL or PostgreSQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.
+
+PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2`.
+
+**Once installed, go to the chosen URL to know the user, domain and port you will have to use for the SFTP access.** The password is one you chosen during the installation. Under the Web directory, you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.
+
+You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. 
+
+
+**Paketatutako bertsioa:** 1.0~ynh19
+## Dokumentazioa eta baliabideak
+
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/YunoHost-Apps/my_webapp_ynh>
+- YunoHost Denda: <https://apps.yunohost.org/app/my_webapp>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade my_webapp -u https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -1,47 +1,48 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
-It shall NOT be edited by hand.
+Nota bene : ce README est automatiquement généré par <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Il NE doit PAS être modifié à la main.
 -->

 # My Webapp pour YunoHost

-[![Niveau d’intégration](https://dash.yunohost.org/integration/my_webapp.svg)](https://dash.yunohost.org/appci/app/my_webapp) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/my_webapp.svg)](https://ci-apps.yunohost.org/ci/apps/my_webapp/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)

 [![Installer My Webapp avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=my_webapp)

-*[Read this readme in english.](./README.md)*
+*[Lire le README dans d'autres langues.](./ALL_README.md)*

-> *Ce package vous permet d’installer My Webapp 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.*
+> *Ce package vous permet d’installer My Webapp rapidement et simplement sur un serveur YunoHost.*  
+> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.*

 ## Vue d’ensemble

 Cette application vous permet d'installer facilement une application vide personnalisée, fourni un accès aux fichiers avec [SFTP](https://yunohost.org/fr/filezilla).

-Elle peut également créer une base de données MySQL - qui sera sauvegardée et restaurée avec votre application. Les détails de connexion seront stockés dans le fichier `db_accesss.txt` situé dans le répertoire racine.
+Elle peut également créer une base de données MySQL ou PostgreSQL - qui sera sauvegardée et restaurée avec votre application. Les détails de connexion seront stockés dans le fichier `db_accesss.txt` situé dans le répertoire racine.

 La version de PHP-FPM peut aussi être choisie, parmi `none`, `7.4`, `8.0`, `8.1` et `8.2`.

 **Une fois installé, rendez-vous sur l'URL choisie pour connaître l'utilisateur, le domaine et le port que vous devrez utiliser pour l'accès SFTP.** Le mot de passe est celui que vous avez choisi lors de l'installation. Sous le répertoire Web, vous verrez un dossier `www` qui contient les fichiers publics servis par cette application. Vous pouvez mettre tous les fichiers de votre application Web personnalisée à l'intérieur.

+L'application vous permet aussi de gérer - si vous activez l'option dans le panneau de configuration - la gestion des erreurs 404, il vous suffit de créer un dossier `error` dans le répertoire racine `www` et d'y placer vos fichiers d'erreur `html` 

-**Version incluse :** 1.0~ynh15
+**Version incluse :** 1.0~ynh19
 ## Documentations et ressources

-* Dépôt de code officiel de l’app : <https://github.com/YunoHost-Apps/my_webapp_ynh>
-* Documentation YunoHost pour cette app : <https://yunohost.org/app_my_webapp>
-* Signaler un bug : <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>
+- Dépôt de code officiel de l’app : <https://github.com/YunoHost-Apps/my_webapp_ynh>
+- YunoHost Store : <https://apps.yunohost.org/app/my_webapp>
+- Signaler un bug : <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>

 ## Informations pour les développeurs

-Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing).
+Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing).

-Pour essayer la branche testing, procédez comme suit.
+Pour essayer la branche `testing`, procédez comme suit :

-``` bash
+```bash
 sudo yunohost app install https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade my_webapp -u https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
 ```

-**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
--- a/README_gl.md
+++ b/README_gl.md
@ -0,0 +1,49 @@
+<!--
+NOTA: Este README foi creado automáticamente por <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+NON debe editarse manualmente.
+-->
+
+# My Webapp para YunoHost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/my_webapp.svg)](https://ci-apps.yunohost.org/ci/apps/my_webapp/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)
+
+[![Instalar My Webapp con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=my_webapp)
+
+*[Le este README en outros idiomas.](./ALL_README.md)*
+
+> *Este paquete permíteche instalar My Webapp de xeito rápido e doado nun servidor YunoHost.*  
+> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.*
+
+## Vista xeral
+
+This application allows you to easily install a custom Web application, providing files access with [SFTP](https://yunohost.org/en/filezilla).
+
+It can also create a MySQL or PostgreSQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.
+
+PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2`.
+
+**Once installed, go to the chosen URL to know the user, domain and port you will have to use for the SFTP access.** The password is one you chosen during the installation. Under the Web directory, you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.
+
+You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. 
+
+
+**Versión proporcionada:** 1.0~ynh19
+## Documentación e recursos
+
+- Repositorio de orixe do código: <https://github.com/YunoHost-Apps/my_webapp_ynh>
+- Tenda YunoHost: <https://apps.yunohost.org/app/my_webapp>
+- Informar dun problema: <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>
+
+## Info de desenvolvemento
+
+Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing).
+
+Para probar a rama `testing`, procede deste xeito:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade my_webapp -u https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+```
+
+**Máis info sobre o empaquetado da app:** <https://yunohost.org/packaging_apps>
--- a/README_id.md
+++ b/README_id.md
@ -0,0 +1,49 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# My Webapp untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/my_webapp.svg)](https://ci-apps.yunohost.org/ci/apps/my_webapp/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)
+
+[![Pasang My Webapp dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=my_webapp)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang My Webapp secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+This application allows you to easily install a custom Web application, providing files access with [SFTP](https://yunohost.org/en/filezilla).
+
+It can also create a MySQL or PostgreSQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.
+
+PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2`.
+
+**Once installed, go to the chosen URL to know the user, domain and port you will have to use for the SFTP access.** The password is one you chosen during the installation. Under the Web directory, you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.
+
+You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. 
+
+
+**Versi terkirim:** 1.0~ynh19
+## Dokumentasi dan sumber daya
+
+- Depot kode aplikasi hulu: <https://github.com/YunoHost-Apps/my_webapp_ynh>
+- Gudang YunoHost: <https://apps.yunohost.org/app/my_webapp>
+- Laporkan bug: <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade my_webapp -u https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
--- a/README_it.md
+++ b/README_it.md
@ -0,0 +1,47 @@
+<!--
+N.B.: Questo README è stato automaticamente generato da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+NON DEVE essere modificato manualmente.
+-->
+
+# My Webapp per YunoHost
+
+[![Livello di integrazione](https://dash.yunohost.org/integration/my_webapp.svg)](https://dash.yunohost.org/appci/app/my_webapp) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)
+
+[![Installa My Webapp con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=my_webapp)
+
+*[Leggi questo README in altre lingue.](./ALL_README.md)*
+
+> *Questo pacchetto ti permette di installare My Webapp su un server YunoHost in modo semplice e veloce.*  
+> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.*
+
+## Panoramica
+
+This application allows you to easily install a custom Web application, providing files access with [SFTP](https://yunohost.org/en/filezilla).
+
+It can also create a MySQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.
+
+PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2`.
+
+**Once installed, go to the chosen URL to know the user, domain and port you will have to use for the SFTP access.** The password is one you chosen during the installation. Under the Web directory, you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.
+
+
+**Versione pubblicata:** 1.0~ynh15
+## Documentazione e risorse
+
+- Repository upstream del codice dell’app: <https://github.com/YunoHost-Apps/my_webapp_ynh>
+- Store di YunoHost: <https://apps.yunohost.org/app/my_webapp>
+- Segnala un problema: <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>
+
+## Informazioni per sviluppatori
+
+Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing).
+
+Per provare la branch di `testing`, si prega di procedere in questo modo:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade my_webapp -u https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+```
+
+**Maggiori informazioni riguardo il pacchetto di quest’app:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -0,0 +1,49 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 My Webapp
+
+[![集成程度](https://dash.yunohost.org/integration/my_webapp.svg)](https://ci-apps.yunohost.org/ci/apps/my_webapp/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/my_webapp.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/my_webapp.maintain.svg)
+
+[![使用 YunoHost 安装 My Webapp](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=my_webapp)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 My Webapp。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+This application allows you to easily install a custom Web application, providing files access with [SFTP](https://yunohost.org/en/filezilla).
+
+It can also create a MySQL or PostgreSQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.
+
+PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2`.
+
+**Once installed, go to the chosen URL to know the user, domain and port you will have to use for the SFTP access.** The password is one you chosen during the installation. Under the Web directory, you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.
+
+You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. 
+
+
+**分发版本：** 1.0~ynh19
+## 文档与资源
+
+- 上游应用代码库： <https://github.com/YunoHost-Apps/my_webapp_ynh>
+- YunoHost 商店： <https://apps.yunohost.org/app/my_webapp>
+- 报告 bug： <https://github.com/YunoHost-Apps/my_webapp_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade my_webapp -u https://github.com/YunoHost-Apps/my_webapp_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>
--- a/conf/nginx-code-error.conf
+++ b/conf/nginx-code-error.conf
@ -0,0 +1,7 @@
+# Build error access
+error_page 403 __PATH__/error/403.html;
+error_page 404 __PATH__/error/404.html;
+
+location ^~ __PATH__/error/ {
+    internal;
+}
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -5,8 +5,8 @@ location __PATH__/ {
    alias __INSTALL_DIR__/www/;

    # Default indexes and catch-all
-    index index.html index.php;
-    try_files $uri $uri/ __PATH__/index.php?$args;
+    index index.php index.html;
+    try_files $uri $uri/ __PATH__/index.php?$args =404;

    # Prevent useless logs
    location = __PATH__/favicon.ico {
--- a/config_panel.toml
+++ b/config_panel.toml
@ -4,19 +4,32 @@ version = "1.0"
 name = "My Webapp configuration"

    [main.sftp]
-    name = "SFTP access"
+    name.en = "SFTP access"
+    name.fr = "Accès SFTP"

        [main.sftp.with_sftp]
-        ask = "Do you need a SFTP access?"
+        ask.en = "Do you need a SFTP access?"
+        ask.fr = "Avez-vous besoin d'un accès SFTP ?"
        type = "boolean"
        default = true

        [main.sftp.password]
-        ask = "Set a password for the SFTP access"
+        ask.en = "Set a password for the SFTP access"
+        ask.fr = "Définir un mot de passe pour l’accès SFTP"
        type = "password"
        optional = true
        visible = "with_sftp"
-        help = "If a password already exist, leave blank and it will not be replaced."
+        help.en = "If a password already exist, leave blank and it will not be replaced."
+        help.fr = "Si un mot de passe existe déjà, laissez vide et il ne sera pas remplacé."
+
+    [main.code_error]
+    name = "Html Custom error"
+
+        [main.code_error.custom_error_file]
+        ask = "Activate the custom error file use"
+        type = "boolean"
+        default = false
+        help = "Once custom error enabled, you can add/create a custom `404.html` file in a directory `www\\error`."

    [main.php_fpm_config]
    name = "PHP-FPM configuration"
@ -24,7 +37,7 @@ name = "My Webapp configuration"
        [main.php_fpm_config.phpversion]
        ask = "PHP version"
        type = "select"
-        choices = ["none", "7.4", "8.0", "8.1", "8.2"]
+        choices = ["none", "7.4", "8.0", "8.1", "8.2", "8.3"]
        default = "none"

        [main.php_fpm_config.fpm_footprint]
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@ -11,13 +11,24 @@ Once installed, go to the chosen URL to know the username, domain and port you w

 To connect, you'll need an SFTP app such as [Filezilla](https://filezilla-project.org/) for Windows, Mac or Linux. You can also use your default file manager on [Mac](https://support.apple.com/guide/mac-help/connect-mac-shared-computers-servers-mchlp1140/mac) or Linux.

-### Adding or editing files
-
-Once logged in SFTP, under the Web directory, you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.
-
-### Forgot your SFTP password?
+#### Forgot your SFTP password?

 If you forgot your SFTP password, you can change it in YunoHost's webadmin interface in `Apps > My webapp > My Webapp configuration`.
+You can also check there that SFTP is enabled.
+
+### Login using the command line
+
+Starting YunoHost v11.1.21, you can run `sudo yunohost app shell __APP__` in the command line interface to log in as your app user.
+
+The `php` command will point to the PHP version installed for the app.
+
+### Adding or editing files
+
+Once logged in, under the Web directory you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.
+
+### 403 and 404 error handling
+
+The web server configuration supports http error handling `403` and `404` (access denied and resource not found). Create an `error` folder at `__INSTALL_DIR__/www/error`, and put your `403.html` and `404.html` files in there.

 ### Customizing the nginx configuration

--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@ -9,19 +9,26 @@ Une fois installée, rendez-vous sur l'URL choisie pour connaître le nom d'util
 - Mot de passe: mot de passe défini lors de l'installation
 - Port: 22 (à moins que vous ayez changé le port SSH)

-Pour vous connectez, vous devrez utiliser une application SFTP tel que [Filezilla](https://filezilla-project.org/) pour Windows, Mac ou Linux. Vous pouvez aussi directement utiliser votre gestionnaire de fichiers sous Linux ou [Mac](https://support.apple.com/guide/mac-help/connect-mac-shared-computers-servers-mchlp1140/mac).
+Pour vous connecter, vous devrez utiliser une application SFTP tel que [Filezilla](https://filezilla-project.org/) pour Windows, Mac ou Linux. Vous pouvez aussi directement utiliser votre gestionnaire de fichiers sous Linux ou [Mac](https://support.apple.com/guide/mac-help/connect-mac-shared-computers-servers-mchlp1140/mac).
+
+#### Oubli du mot de passe SFTP
+
+Si vous avez oublié votre mot de passe SFTP, vous pouvez le changer dans la webadmin de Yunohost dans `Applications > Votre webapp > My Webapp configuration`.
+Vous pourrez aussi vérifier que SFTP est activé pour votre app.
+
+### Connexion par le terminal
+
+A partir de YunoHost v11.1.21, vous pouvez lancer `sudo yunohost app shell __APP__` dans un terminal pour vous connecter en tant que l'utilisateur gérant l'app.
+
+La commande `php` pointera vers la version de PHP installée pour l'app.

 ### Ajouter ou modifier les fichiers

-Après vous être connecté avec SFTP, sous le répertoire Web, vous verrez un dossier `www` qui contient les fichiers publics servis par cette application. Vous pouvez mettre tous les fichiers de votre application Web personnalisée à l'intérieur.
+Après vous être connecté, sous le répertoire Web vous verrez un dossier `www` qui contient les fichiers publics servis par cette application. Vous pouvez mettre tous les fichiers de votre application Web personnalisée à l'intérieur.

-### Oubli du mot de passe SFTP
+### Gestion des erreurs 403 et 404

-Si vous avez oublié votre mot de passe SFTP, vous pouvez le changer dans la webadmin de Yunohost dans `Applications > Votre webapp > My Webapp configuration`.
-
-## Résolution de problèmes
-
-Si vous n'arrivez pas à vous connecter et que vous avez vérifié que le nom d'utilisateur et le mot de passe sont bons, vérifiez si SFTP est activé pour votre app
+La configuration du serveur web prend en charge la gestion des erreurs http `403` et `404` (accès refusé et ressource non trouvée). Ajoutez un dossier `error` à l'emplacement `__INSTALL_DIR__/www/error`, puis ajoutez-y vos fichiers `403.html` et `404.html`.

 ### Personnaliser la configuration nginx

--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@ -1,7 +1,9 @@
 This application allows you to easily install a custom Web application, providing files access with [SFTP](https://yunohost.org/en/filezilla).

-It can also create a MySQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.
+It can also create a MySQL or PostgreSQL database - which will be backed up and restored with your application. The connection details will be stored in the file `db_access.txt` located in the root directory.

 PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2`.

 **Once installed, go to the chosen URL to know the user, domain and port you will have to use for the SFTP access.** The password is one you chosen during the installation. Under the Web directory, you will see a `www` folder which contains the public files served by this app. You can put all the files of your custom Web application inside.
+
+You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. 
--- a/doc/DESCRIPTION_fr.md
+++ b/doc/DESCRIPTION_fr.md
@ -1,7 +1,9 @@
 Cette application vous permet d'installer facilement une application vide personnalisée, fourni un accès aux fichiers avec [SFTP](https://yunohost.org/fr/filezilla).

-Elle peut également créer une base de données MySQL - qui sera sauvegardée et restaurée avec votre application. Les détails de connexion seront stockés dans le fichier `db_accesss.txt` situé dans le répertoire racine.
+Elle peut également créer une base de données MySQL ou PostgreSQL - qui sera sauvegardée et restaurée avec votre application. Les détails de connexion seront stockés dans le fichier `db_accesss.txt` situé dans le répertoire racine.

 La version de PHP-FPM peut aussi être choisie, parmi `none`, `7.4`, `8.0`, `8.1` et `8.2`.

 **Une fois installé, rendez-vous sur l'URL choisie pour connaître l'utilisateur, le domaine et le port que vous devrez utiliser pour l'accès SFTP.** Le mot de passe est celui que vous avez choisi lors de l'installation. Sous le répertoire Web, vous verrez un dossier `www` qui contient les fichiers publics servis par cette application. Vous pouvez mettre tous les fichiers de votre application Web personnalisée à l'intérieur.
+
+L'application vous permet aussi de gérer - si vous activez l'option dans le panneau de configuration - la gestion des erreurs 404, il vous suffit de créer un dossier `error` dans le répertoire racine `www` et d'y placer vos fichiers d'erreur `html` 
--- a/doc/POST_INSTALL.md
+++ b/doc/POST_INSTALL.md
@ -1,7 +1,12 @@
-If you have requested a MYSQL database, please find information about this SQL database:
+{% if database != 'none' %}

+Here are information to log into the database:
+
+- Type: __DATABASE__
 - Database user: __DB_USER__
 - Database name: __DB_NAME__
 - Password: __DB_PWD__

-The admin documentation below also contain information on how to connect using SFTP to edit the website content.
+{% endif %}
+
+The admin documentation below contains information on how to connect using SFTP to edit the website content.
--- a/doc/POST_INSTALL_fr.md
+++ b/doc/POST_INSTALL_fr.md
@ -1,7 +1,12 @@
-Si vous avez demandé une base de données MYSQL, voici les informations de cette base de données SQL :
+{% if database != 'none' %}

+Voici les informations pour se connecter à la base de donnée:
+
+- Type : __DATABASE__
 - Utilisateur de la base de données : __DB_USER__
 - Nom de la base de données : __DB_NAME__
 - Mot de passe : __DB_PWD__

-La documentation ci-dessous contient également les informations pour se connecter en SSH et modifier le contenu du site web.
+{% endif %}
+
+La documentation ci-dessous contient les informations pour se connecter en SSH et modifier le contenu du site web.
--- a/manifest.toml
+++ b/manifest.toml
@ -5,7 +5,7 @@ name = "My Webapp"
 description.en = "Custom Web app with SFTP access to serve static (HTML, CSS, JS) and PHP files"
 description.fr = "Application Web personnalisée avec accès SFTP pour servir des fichiers statiques (HTML, CSS, JS) et PHP"

-version = "1.0~ynh15"
+version = "1.0~ynh19"

 maintainers = []

@ -14,7 +14,7 @@ license = "GPL-3.0-only"
 code = "https://github.com/YunoHost-Apps/my_webapp_ynh"

 [integration]
-yunohost = ">= 11.1.19"
+yunohost = ">= 11.2.4"
 architectures = "all"
 multi_instance = true
 ldap = "not_relevant"
@ -48,15 +48,22 @@ ram.runtime = "50M"
    [install.phpversion]
    ask.en = "Choose a PHP version you want to use for your app"
    ask.fr = "Choisissez une version PHP que vous souhaitez utiliser pour votre application"
-    type = "string"
-    choices = ["none", "7.4", "8.0", "8.1", "8.2"]
-    default = "8.0"
+    type = "select"
+    choices = ["none", "7.4", "8.0", "8.1", "8.2", "8.3"]
+    default = "8.3"

-    [install.with_mysql]
-    ask.en = "Do you need a MySQL database?"
-    ask.fr = "Avez-vous besoin d'une base de données MySQL ?"
+    [install.database]
+    ask.en = "Do you need a database?"
+    ask.fr = "Avez-vous besoin d'une base de données ?"
+    type = "select"
+    choices = [ "none", "mysql", "postgresql" ]
+    default = "none"
+
+    [install.custom_error_file]
+    ask = "Activate the custom error file use"
    type = "boolean"
    default = false
+    help = "Once custom error enabled, you can add/create a custom `404.html` file in a directory `www/error`."

 [resources]
    [resources.system_user]
@ -69,13 +76,21 @@ ram.runtime = "50M"
    [resources.apt]
    packages = "nginx"  # Kind of "dummy" value to be sure to have a non-empty dep list
    packages_from_raw_bash = """
-        if [[ "$with_mysql" = 1 ]]
-        then 
+        if [[ "$database" == "mysql" ]]; then
            echo "mariadb-server"
+
+            if [[ "$phpversion" != none ]]; then
+                echo "php${phpversion}-mysql"
+            fi
+        elif [[ "$database" == "postgresql" ]]; then
+            echo "postgresql postgresql-contrib"
+
+            if [[ "$phpversion" != none ]]; then
+                echo "php${phpversion}-pgsql"
+            fi
        fi

-        if [[ "$phpversion" != none ]]
-        then
-            echo "php${phpversion}-fpm php${phpversion}-mysql"
+        if [[ "$phpversion" != none ]]; then
+            echo "php${phpversion}-fpm"
        fi
    """
--- a/scripts/backup
+++ b/scripts/backup
@ -40,10 +40,15 @@ fi
 # BACKUP THE MYSQL DATABASE
 #=================================================

-if [ $with_mysql -eq 1 ]
+if [ $database != "none" ]
 then
-    ynh_print_info --message="Backing up the MySQL database..."
-    ynh_mysql_dump_db --database="$db_name" > db.sql
+    ynh_print_info --message="Backing up the database..."
+
+    if [ $database == "mysql" ]; then
+        ynh_mysql_dump_db --database="$db_name" > db.sql
+    elif [ $database == "postgresql" ]; then
+        ynh_psql_dump_db --database="$db_name" > db.sql
+    fi
 fi

 #=================================================
--- a/scripts/change_url
+++ b/scripts/change_url
@ -52,6 +52,12 @@ then
 	domain="$old_domain"
 	path_url="$new_path"

+	# Update custom error file path if needed
+	if [ $custom_error_file -eq 1 ]
+	then
+		ynh_add_config --template="nginx-code-error.conf" --destination="$nginx_extra_conf_dir/error-code.conf"
+	fi
+
 	# Create a dedicated NGINX config
 	ynh_add_nginx_config
 fi
@ -62,6 +68,7 @@ then
 	# Delete file checksum for the old conf file location
 	ynh_delete_file_checksum --file="$nginx_conf_path"
 	ynh_delete_file_checksum --file="$nginx_extra_conf_dir/php.conf"
+	ynh_delete_file_checksum --file="$nginx_extra_conf_dir/error-code.conf"

 	path_url="$new_path"
 	domain="$old_domain"
@ -73,7 +80,14 @@ then
 	mv $nginx_extra_conf_dir /etc/nginx/conf.d/$new_domain.d/$app.d

 	# Store file checksum for the new config file location
-	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.d/php.conf"
+	if [ $phpversion != "none" ]
+	then
+		ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.d/php.conf"
+	fi
+	if [ $custom_error_file -eq 1 ]
+	then
+		ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.d/error-code.conf"
+	fi
 fi

 #=================================================
--- a/scripts/config
+++ b/scripts/config
@ -59,7 +59,7 @@ get__free_footprint() {
 #=================================================

 set__password() {
-    if [ "$password" == "" ]
+    if [ ! "$password" == "" ]
    then
        ynh_app_setting_set --app=$app --key=password --value="$password"
    fi
@ -112,13 +112,21 @@ ynh_app_config_apply() {

    if [ "${changed[phpversion]}" == "true" ]
    then
-        ynh_app_setting_set --app=$app --key=phpversion --value="${old[phpversion]}"
-        ynh_remove_fpm_config
-        # ^ the helper includes ynh_remove_app_dependencies
+        if [ "${old[phpversion]}" != "none" ]
+        then
+            ynh_app_setting_set --app=$app --key=phpversion --value="${old[phpversion]}"
+            ynh_remove_fpm_config
+        fi
+        ynh_remove_app_dependencies
        YNH_PHP_VERSION=$phpversion
        # ^ ynh_add_config replaces __PHPVERSION__ by __PHP_YNH_VERSION__...
        ynh_app_setting_set --app=$app --key=phpversion --value="$phpversion"

+        database=$(ynh_app_setting_get --app=$app --key=database)
+        dependencies="$(ynh_read_manifest -k "resources.apt.packages")"
+        dependencies_from_raw_bash=$(eval "$(ynh_read_manifest -k "resources.apt.packages_from_raw_bash")" | tr "\n" " ")
+        ynh_install_app_dependencies "$dependencies $dependencies_from_raw_bash"
+
        nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d"
        mkdir -p "$nginx_extra_conf_dir"
        if [ "$phpversion" == "none" ]
@ -127,7 +135,6 @@ ynh_app_config_apply() {
            ynh_secure_remove --file="$nginx_extra_conf_dir/php.conf"
        else
            ynh_add_config --template="nginx-php.conf" --destination="$nginx_extra_conf_dir/php.conf"
-            ynh_install_app_dependencies "php${phpversion}-fpm"
            ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
            # ^ the helper takes care of ynh_app_setting_set the phpversion
        fi
@ -147,6 +154,26 @@ ynh_app_config_apply() {
    then
        ynh_system_user_del_group --username=$app --groups="sftp.app"
    fi
+    
+    if [ "${changed[password]}" == "true" ] && [ ! "$password" == "" ]
+    then
+        chpasswd <<< "${app}:${password}"
+    fi
+
+    if [ "${changed[custom_error_file]}" == "true" ]
+    then
+        CUSTOM_ERROR_FILE=$custom_error_file
+        nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d"
+
+        if [ $custom_error_file -eq 1 ]
+        then
+            ynh_add_config --template="nginx-code-error.conf" --destination="$nginx_extra_conf_dir/error-code.conf"
+        elif [ $custom_error_file -eq 0 ]
+        then
+            ynh_secure_remove --file="$nginx_extra_conf_dir/error-code.conf"
+        fi
+        ynh_systemd_action --service_name=nginx --action=reload
+    fi

    if [ "$phpversion" != "none" ]
    then
--- a/scripts/install
+++ b/scripts/install
@ -35,9 +35,8 @@ ynh_app_setting_set --app=$app --key=password --value=$password
 # CREATE A MYSQL DATABASE
 #=================================================

-if [ $with_mysql -eq 1 ]
-then
-    ynh_script_progression --message="Creating a MySQL database..." --weight=2
+if [ $database != "none" ]; then
+    ynh_script_progression --message="Creating a database..." --weight=2

    db_name=$(ynh_sanitize_dbid --db_name=$app)
    db_user=$db_name
@ -45,7 +44,12 @@ then
    ynh_app_setting_set --app=$app --key=db_name --value=$db_name
    ynh_app_setting_set --app=$app --key=db_user --value=$db_user
    ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd
-    ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+
+    if [ $database == "mysql" ]; then
+        ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+    elif [ $database == "postgresql" ]; then
+        ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+    fi
 fi

 #=================================================
@ -63,6 +67,13 @@ then
    YNH_PHP_VERSION="$phpversion"
 fi

+if [ $custom_error_file -eq 1 ]
+then
+    # Add the custom error build with the application
+    ynh_add_config --template="nginx-code-error.conf" --destination="$nginx_extra_conf_dir/error-code.conf"
+fi
+
+
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 ynh_add_config --template="example-custom-nginx-config.conf" --destination="$nginx_extra_conf_dir/sample.conf"
--- a/scripts/remove
+++ b/scripts/remove
@ -15,14 +15,18 @@ source /usr/share/yunohost/helpers
 # REMOVE THE MYSQL DATABASE
 #=================================================

-if [ $with_mysql -eq 1 ]; then
-    ynh_script_progression --message="Removing the MySQL database..." --weight=2
+if [ $database != "none" ]; then
+    ynh_script_progression --message="Removing the database..." --weight=2

    db_name=$(ynh_app_setting_get --app=$app --key=db_name)
    db_user=$db_name

    # Remove a database if it exists, along with the associated user
-    ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
+    if [ $database == "mysql" ]; then
+        ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
+    elif [ $database == "postgresql" ]; then
+        ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
+    fi
 fi

 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -14,20 +14,26 @@ source /usr/share/yunohost/helpers
 #=================================================

 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.d/"
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.d"

 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================

-if [ $with_mysql -eq 1 ]; then
-    ynh_script_progression --message="Restoring the MySQL database..."
+if [ $database != "none" ]; then
+    ynh_script_progression --message="Restoring the database..."

    db_name=$(ynh_app_setting_get --app=$app --key=db_name)
    db_user=$db_name
    db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
-    ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
-    ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
+
+    if [ $database == "mysql" ]; then
+        ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+        ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
+    elif [ $database == "postgresql" ]; then
+        ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+        ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
+    fi
 fi

 #=================================================
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -20,6 +20,18 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..."

+# If database doesn't exist, create it and remove with_mysql setting
+if [ -z "${database:-}" ]; then
+    if [ $with_mysql -eq 1 ]; then
+        database="mysql"
+    else
+        database="none"
+    fi
+    
+    ynh_app_setting_set --app=$app --key=database --value=$database
+    ynh_app_setting_delete --app=$app --key=with_mysql
+fi
+
 # If admin_mail_html doesn't exist, create it
 if [ -z "${admin_mail_html:-}" ]; then
 	admin_mail_html=1
@ -56,6 +68,12 @@ if [ -z "$phpversion" ]; then
 	ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion
 fi

+# If custom_error_file doesn't exist, create it.
+if [ -z "${custom_error_file:-}" ]; then
+	custom_error_file=0
+	ynh_app_setting_set --app=$app --key=custom_error_file --value=$custom_error_file
+fi
+
 # Delete old user
 if [ -n "$(ynh_app_setting_get --app=$app --key=user)" ]
 then
@ -90,6 +108,12 @@ then
    YNH_PHP_VERSION="$phpversion"
 fi

+# Add the config error code
+if [ $custom_error_file -eq 1 ]
+then
+    ynh_add_config --template="nginx-code-error.conf" --destination="$nginx_extra_conf_dir/error-code.conf"
+fi
+
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 ynh_add_config --template="example-custom-nginx-config.conf" --destination="$nginx_extra_conf_dir/sample.conf"
--- a/tests.toml
+++ b/tests.toml
@ -7,15 +7,55 @@ test_format = 1.0
    # -------------------------------

    args.with_sftp = "1"
-    args.with_mysql = "1"
-	args.phpversion = "8.0"
+    args.custom_error_file = "0"
+    args.password = "SuperDuper_StrongPassw0rd"
+    args.database = "none"
+    args.phpversion = "8.3"
+    test_upgrade_from.bf5d3ed.name = "1.0~ynh14"
+    test_upgrade_from.bf5d3ed.args.with_mysql = "0"
+    test_upgrade_from.bf5d3ed.args.domain = "sub.domain.tld"
+    test_upgrade_from.bf5d3ed.args.path = "/"
+    test_upgrade_from.bf5d3ed.args.password = "SuperDuper_StrongPassw0rd"

 [80_test]

    only = ["install.subdir", "backup_restore", "upgrade" ]
    args.phpversion = "8.0"

-[none_test]
+[81_test]

    only = ["install.subdir", "backup_restore", "upgrade" ]
+    args.phpversion = "8.1"
+
+[82_test]
+
+    only = ["install.subdir", "backup_restore", "upgrade" ]
+    args.phpversion = "8.2"
+
+[none_test]
+
    args.phpversion = "none"
+
+[mysql_test]
+
+    only = ["install.subdir", "backup_restore", "upgrade", "upgrade.bf5d3ed" ]
+    args.database = "mysql"
+    test_upgrade_from.bf5d3ed.name = "1.0~ynh14"
+    test_upgrade_from.bf5d3ed.args.with_mysql = "1"
+    test_upgrade_from.bf5d3ed.args.domain = "sub.domain.tld"
+    test_upgrade_from.bf5d3ed.args.path = "/"
+    test_upgrade_from.bf5d3ed.args.password = "SuperDuper_StrongPassw0rd"
+
+[postgresql_test]
+
+    only = ["install.subdir", "backup_restore", "upgrade" ]
+    args.database = "postgresql"
+
+[custom_error_file_test]
+
+    args.custom_error_file = "1"
+    test_upgrade_from.bf5d3ed.name = "1.0~ynh14"
+    test_upgrade_from.bf5d3ed.args.with_mysql = "0"
+    test_upgrade_from.bf5d3ed.args.domain = "sub.domain.tld"
+    test_upgrade_from.bf5d3ed.args.path = "/"
+    test_upgrade_from.bf5d3ed.args.password = "SuperDuper_StrongPassw0rd"
Author	SHA1	Message	Date
Alexandre Aubin	9a1cf68d98	Merge pull request #141 from YunoHost-Apps/testing Testing	2024-08-07 15:17:05 +02:00
yunohost-bot	f1545592a8	Auto-update READMEs	2024-08-07 13:16:58 +00:00
Alexandre Aubin	e59b8f1417	Update manifest.toml: bump version	2024-08-07 15:16:54 +02:00
Alexandre Aubin	d291edbc72	wtf...	2024-08-07 15:15:51 +02:00
Kayou	6566e1ce4f	Merge pull request #140 from YunoHost-Apps/testing Testing	2024-07-29 16:35:04 +02:00
yunohost-bot	991cab74e4	Auto-update READMEs	2024-07-29 14:32:02 +00:00
Kayou	db825702a0	bump package	2024-07-29 16:31:58 +02:00
Kayou	477d98f4a6	do not remove old fpm config if phpversion was none	2024-07-29 16:31:40 +02:00
yunohost-bot	ea932c9763	Auto-update READMEs	2024-07-29 08:07:53 +00:00
Kayou	a41c46b182	Merge pull request #129 from YunoHost-Apps/testing Testing	2024-07-29 10:07:46 +02:00
Kayou	89fbb93c76	fix restore script	2024-07-24 11:59:06 +02:00
Kayou	19f09d8569	Note to self - open your eyes BEFORE writing code	2024-07-24 10:14:09 +02:00
Kayou	db7dcbdd1b	fix change_url²	2024-07-23 17:43:36 +02:00
Kayou	eca97b65aa	fix change url	2024-07-23 16:36:00 +02:00
Kayou	7226257ce8	add all tests for custom_error_file_test	2024-07-23 14:04:28 +02:00
Kayou	df628b6cd1	add a test for custom_error_file	2024-07-23 14:01:30 +02:00
Kayou	f92817b922	add custom_error_file in the manifest, default to false	2024-07-23 13:57:51 +02:00
Kayou	55c0bbb594	fix indent	2024-07-23 13:52:14 +02:00
Kayou	cb465e8573	reenable ynh_delete_file_checksum of the nginx error conf file, let's wait the CI	2024-07-23 13:48:14 +02:00
Kayou	72ae3827de	Reinstall all the dependencies when changing php version² (remove php-fpm deps if phpversion is none)	2024-07-23 13:43:07 +02:00
yunohost-bot	f7e3c828ec	Auto-update READMEs	2024-07-23 11:36:02 +00:00
Kayou	7d29233133	Merge pull request #138 from grenagit/master Fix password change	2024-07-23 13:35:57 +02:00
yunohost-bot	81ecb8ba90	Auto-update READMEs	2024-07-03 16:09:59 +00:00
tituspijean	cefdd63e38	Typo	2024-07-03 18:09:55 +02:00
yunohost-bot	da1fc5e54b	Auto-update READMEs	2024-06-24 10:13:24 +00:00
eric_G	c886821dcd	Merge branch 'master' into testing	2024-06-24 12:13:21 +02:00
Félix Piédallu	e4ff31c6c8	Update READMEs	2024-06-23 13:33:55 +02:00
Grena	0f47d1c6cb	Add french translation of SFTP access into config panel	2024-06-05 10:46:55 +02:00
Grena	cab30de685	Fix password change	2024-06-05 10:30:49 +02:00
Alexandre Aubin	e16a41b7dd	Update change_url: zgrmblpfhonmgf	2024-05-09 16:34:08 +02:00
Alexandre Aubin	17aa532b66	Update backup: remove unecessary code for custom error page, the .d folder is already backuped/restored	2024-05-09 16:32:26 +02:00
yunohost-bot	0540f194c8	Auto-update READMEs	2024-05-09 08:59:44 +00:00
eric_G	fb03afacc7	Merge branch 'master' into testing	2024-05-09 10:59:40 +02:00
eric_G	baaa89c14a	Merge pull request #137 from YunoHost-Apps/php8.3 Php8.3 + better default version	2024-05-09 10:57:57 +02:00
lapineige	e51913303c	Update config_panel.toml : add php8.3	2024-05-07 16:58:16 +02:00
tituspijean	8213b4d9a3	Add more PHP tests	2024-05-07 16:54:53 +02:00
tituspijean	23535f094f	Bump default PHP version to 8.3 Co-authored-by: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>	2024-05-07 16:53:49 +02:00
yunohost-bot	22f48f479f	Auto-update READMEs	2024-05-07 14:20:38 +00:00
lapineige	0ab0c6b302	bump version	2024-05-07 16:20:07 +02:00
lapineige	36738b45a1	add php8.3 + default to php8.1	2024-05-07 16:18:30 +02:00
yunohost-bot	1bb337ce18	Auto-update READMEs	2024-05-07 14:17:57 +00:00
yunohost-bot	0b62011418	Auto-update README	2024-03-29 07:14:29 +01:00
Alexandre Aubin	7d592faabe	Merge pull request #130 from fflorent/patch-1 Remove dependencies and reinstall them when changing php version	2024-01-22 17:36:48 +01:00
Alexandre Aubin	25ec30c166	Merge branch 'master' into testing	2023-11-10 01:06:08 +01:00
yunohost-bot	9defce59be	Auto-update README	2023-10-31 14:24:24 +00:00
Florent	4801ff47a8	Reinstall all the dependencies when changing php version #131	2023-10-15 11:52:50 +02:00
Florent	365d2c7641	explicitly call ynh_remove_app_dependencies when changing phpversion	2023-10-15 11:52:50 +02:00
yunohost-bot	37d888f16a	Auto-update README	2023-10-08 08:55:36 +00:00
Éric Gaspar	e4f955e2dc	Update manifest.toml	2023-10-08 10:55:29 +02:00
eric_G	e51caa96f1	Merge pull request #128 from YunoHost-Apps/php-priority Prioritize index.php over index.html	2023-10-08 10:54:23 +02:00
tituspijean	8087993534	Prioritize index.php over index.html	2023-10-08 10:49:57 +02:00
yunohost-bot	9b8d318fb6	Auto-update README	2023-10-08 08:47:38 +00:00
tituspijean	d91b1bc502	Merge pull request #119 from stilobique/master Setup 404 error code	2023-10-08 10:47:32 +02:00
tituspijean	55190b8272	Improve error pages documentation	2023-10-08 10:40:01 +02:00
Aurelien Vaillant	060e15e365	Update config_panel.toml Tweak the help message Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com>	2023-09-27 23:27:41 +02:00
yunohost-bot	00b181c417	Auto-update README	2023-09-26 08:10:13 +00:00
Éric Gaspar	6ea232f503	Add PostgreSQL database	2023-09-26 10:10:08 +02:00
tituspijean	1a1784d669	Merge pull request #122 from YunoHost-Apps/testing Testing \| Improving databases: password fix and type selection	2023-09-15 16:13:13 +02:00
tituspijean	2e7f35d11b	Fix tests.toml, again?	2023-09-14 16:40:33 +02:00
Alexandre Aubin	a0a8d326d0	Merge pull request #124 from YunoHost-Apps/jinja-doc Conditional block for POST_INSTALL.md	2023-08-31 23:29:54 +02:00
Alexandre Aubin	2e5a452b53	Merge branch 'testing' into jinja-doc	2023-08-31 20:46:50 +02:00
Alexandre Aubin	18c71da044	Bump yunohost requirement	2023-08-31 17:50:48 +02:00
Éric Gaspar	f65d02d7d0	Update manifest.toml	2023-08-27 22:12:59 +02:00
Aurelien Vaillant	66249120de	Revert the default value, set to false	2023-08-21 15:50:54 +02:00
Aurelien Vaillant	c1c68f9463	Fix warning info with the change url script	2023-08-21 15:38:14 +02:00
Aurelien Vaillant	44f371dae6	WIP: Update the custom config file	2023-08-21 15:20:52 +02:00
Aurelien Vaillant	b6a23c7bc5	Wrong filename	2023-08-21 15:12:24 +02:00
Aurelien Vaillant	66626c71c7	Wrong backup path	2023-08-21 15:04:42 +02:00
Aurelien Vaillant	2c0b155c94	Change conditional expression	2023-08-21 15:02:29 +02:00
Aurelien Vaillant	9dbb8b1821	Fix warning message about the backup	2023-08-21 14:59:50 +02:00
Aurelien Vaillant	ee658ef966	Comment change url config	2023-08-21 13:32:40 +02:00
Aurelien Vaillant	c4c9581eab	Generate backup about the custom error setup	2023-08-21 13:31:36 +02:00
Aurelien Vaillant	ad2673106c	Update change_url script to update location path nginx error	2023-08-21 13:27:43 +02:00
Aurelien Vaillant	ac625f32d3	Change description info to be more accurate	2023-08-21 12:31:26 +02:00
Aurelien Vaillant	467aef4618	Update location path, fix about the sub-dir setting ; and change url	2023-08-18 16:32:42 +02:00
Aurelien Vaillant	c4cc60d93f	Update location path, fix about the sub-dir setting	2023-08-18 14:29:42 +02:00
Aurelien Vaillant	0f008b68d2	Fix setting set about custom error code value	2023-08-18 11:23:39 +02:00
Aurelien Vaillant	7d919559a1	Variable type set	2023-08-18 11:19:17 +02:00
Aurelien Vaillant	1eb8d54769	init the custom error config	2023-08-18 11:10:25 +02:00
Aurelien Vaillant	791d7880e9	Fix the install script	2023-08-18 11:06:48 +02:00
Aurelien Vaillant	7b0b29cdcc	Update install and upgrade script. Clear old debug info.	2023-08-18 10:46:04 +02:00
Aurelien Vaillant	9d885a896a	Set to true the default error code status used	2023-08-18 10:35:16 +02:00
Aurelien Vaillant	d7271b65af	Update the nginx to be reload and not restart	2023-08-18 10:19:31 +02:00
Aurelien Vaillant	bcdf80162f	Add information in the admin fr/en text	2023-08-18 10:12:23 +02:00
Aurelien Vaillant	db2876a58a	Remove unused setup	2023-08-18 10:01:56 +02:00
Aurelien Vaillant	b578765b41	Fix location path error config	2023-08-18 09:55:41 +02:00
Aurelien Vaillant	c409b9d0e1	Clear debug message, and add a restart about Nginx service	2023-08-18 09:40:42 +02:00
Aurelien Vaillant	04338ac091	Restart Nginx with the config update	2023-08-18 09:19:41 +02:00
Aurelien Vaillant	10f3e8eabb	Merge remote-tracking branch 'origin/master' # Conflicts: # conf/nginx-code-error.conf	2023-08-17 19:37:27 +02:00
Aurelien Vaillant	08a58729a2	Change - once again - the nginx error build	2023-08-17 19:36:41 +02:00
Aurelien Vaillant	adf7f2ba83	Change - once again - the nginx error build	2023-08-17 19:33:37 +02:00
Aurelien Vaillant	a561b9c449	Try another way with the status code return	2023-08-17 19:10:47 +02:00
Aurelien Vaillant	5f1dfbd192	Wrong path construction with the nginx error code	2023-08-17 18:22:53 +02:00
Aurelien Vaillant	ea8278b48b	Add the 403 error code build	2023-08-17 18:19:59 +02:00
Aurelien Vaillant	18041281e3	Update config with int comparaison	2023-08-17 18:13:41 +02:00
Aurelien Vaillant	8d4188382b	Add debug info with the config file	2023-08-17 18:08:11 +02:00
Aurelien Vaillant	8c3b1e2161	Update config with the conditional state in the custom error file section	2023-08-17 18:04:47 +02:00
Aurelien Vaillant	9e6f1621b4	Clear the config panel file	2023-08-17 18:02:02 +02:00
Aurelien Vaillant	1b4c09bc1d	Update the On/Off error code parameter Revert nginx config	2023-08-17 17:56:51 +02:00
Aurelien Vaillant	42a5b89393	Test config script	2023-08-17 17:22:57 +02:00
Aurelien Vaillant	d51c90ffb9	Remove unused setting set	2023-08-17 17:18:55 +02:00
Aurelien Vaillant	e7b199e573	Remove old post-install info	2023-08-17 17:18:33 +02:00
Aurelien Vaillant	d025544131	On/Off nginx file	2023-08-17 17:01:36 +02:00
Aurelien Vaillant	632567c13f	Change path declaration	2023-08-17 16:33:34 +02:00
Aurelien Vaillant	efc260135c	Variable not declared	2023-08-17 16:30:25 +02:00
Aurelien Vaillant	beb6c7e399	Update nginx config Fix config function	2023-08-17 16:20:51 +02:00
Aurelien Vaillant	1e5d23df24	Update the update script	2023-08-17 15:57:28 +02:00
Aurelien Vaillant	92c8673646	Tweak the description en/fr	2023-08-17 15:49:08 +02:00
tituspijean	8d39c98681	Fix tests.toml, again	2023-08-17 15:29:40 +02:00
Aurelien Vaillant	ab80419566	Write a short description info about the 404 errors setup	2023-08-17 15:01:51 +02:00
tituspijean	05b98eafba	Fix tests.toml	2023-08-17 12:41:11 +02:00
Aurelien Vaillant	f06a4f5ba9	Try another conditional test	2023-08-17 11:33:48 +02:00
Aurelien Vaillant	7b02f2817e	Another test about the init variable	2023-08-17 11:25:18 +02:00
Aurelien Vaillant	8339439135	Fix bad variable allocation	2023-08-17 11:05:13 +02:00
tituspijean	fd0fe51048	Add password in tests	2023-08-16 22:48:31 +02:00
tituspijean	0ba29961e5	Fix jinja template Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>	2023-08-16 19:33:52 +02:00
Aurelien Vaillant	3396894985	Update config file	2023-08-16 19:29:01 +02:00
tituspijean	b6f86b2f4e	Jinja template for the POST_INSTALL doc	2023-08-16 19:28:52 +02:00
Aurelien Vaillant	c0688fc115	Add more debug info	2023-08-16 18:56:49 +02:00
Aurelien Vaillant	613e58e149	Change a set value	2023-08-16 18:49:45 +02:00
Aurelien Vaillant	9384644c80	Update upgrade script to fix the unbound variable error	2023-08-16 18:40:21 +02:00
Aurelien Vaillant	8fe710187a	Update install/upgrade	2023-08-16 18:36:04 +02:00
tituspijean	5a6756a8c4	Enhance FR login documentation	2023-08-16 18:18:30 +02:00
Aurelien Vaillant	74526f2e53	Remove duplicate nginx config Clear manifest data, option only available with the config panel Try to setup the config panel Set the version number	2023-08-16 18:16:57 +02:00
tituspijean	7a2eba44db	Enhance login documentation	2023-08-16 18:06:32 +02:00
tituspijean	ce93180771	Fix phpversion question type	2023-08-16 17:52:17 +02:00
tituspijean	4ebc7e27d5	Merge pull request #118 from YunoHost-Apps/enh-postgresql Implement postgresql database choice	2023-08-16 17:40:40 +02:00
tituspijean	e3599fe60c	Improve POST_INSTALL documentation for databases	2023-08-16 17:37:36 +02:00
tituspijean	cf1e857017	Merge branch 'testing' into enh-postgresql	2023-08-16 17:15:42 +02:00
tituspijean	9e25b1d0a0	Merge pull request #121 from YunoHost-Apps/fix-db Fix db_pwd	2023-08-16 17:13:48 +02:00
--help	adb9f09d60	Change the upgrade config Update the post-install documentation	2023-08-15 15:09:55 +02:00
--help	b863da7cff	Update upgrade to set the code error	2023-08-13 10:47:43 +02:00
--help	8b30a536cb	Try to setup the error code upgrade	2023-08-13 09:39:48 +02:00
--help	140562326e	Try to config the 404.html file Remove error page 50X	2023-08-13 09:08:31 +02:00
--help	718c0dbdd8	Fix path error_page	2023-08-12 17:58:39 +02:00
--help	4255b0a4bc	Add code error 50X	2023-08-12 16:52:25 +02:00
--help	7083a50ec8	Update app version	2023-08-12 13:29:35 +02:00
--help	6095c6c21f	Update default config about the http error	2023-08-12 13:21:59 +02:00
--help	7029f6eb85	Add error 404 code	2023-08-12 11:30:01 +02:00
Tagada	1d83be3e56	Update manifest.toml	2023-06-10 22:38:37 +02:00
Tagada	b5f4e50ff9	fix database: unbound variable	2023-05-28 22:16:28 +02:00
Tagada	810c3facfa	i really can't type /o\	2023-05-28 21:01:51 +02:00
Tagada	8657238c52	oops³	2023-05-28 20:04:50 +02:00
Tagada	8cff6952cb	opps²	2023-05-28 19:29:25 +02:00
Tagada	0f78b7f4b1	oops	2023-05-28 19:02:02 +02:00
Tagada	80f55d4feb	Implement postgresql database choice	2023-05-28 18:43:16 +02:00
Éric Gaspar	bf5d3ed5d5	Merge pull request #116 from YunoHost-Apps/testing Testing	2023-05-28 18:04:34 +02:00