Merge branch 'testing' into pr/78

ALL_README.md

@@ -0,0 +1,7 @@
+# All available README files by language
+
+- [Read the README in English](README.md)
+- [Irakurri README euskaraz](README_eu.md)
+- [Lire le README en français](README_fr.md)
+- [Le o README en galego](README_gl.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -1,5 +1,5 @@
 <!--
-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.
 -->
 
@@ -9,17 +9,17 @@ It shall NOT be edited by hand.
 
 [![Install Monica with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monica)
 
-*[Lire ce readme en français.](./README_fr.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
-> *This package allows you to install Monica quickly and simply on a YunoHost server.
+> *This package allows you to install Monica 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.*
+> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
 
 ## Overview
 
 Monica is an open-source web application to organize the interactions with your loved ones. I call it a PRM, or Personal Relationship Management. Think of it as a [CRM](https://en.wikipedia.org/wiki/Customer_relationship_management) (a popular tool used by sales teams in the corporate world) for your friends or family.
 
 
-**Shipped version:** 4.0.0~ynh2
+**Shipped version:** 4.1.2~ynh1
 
 ## Screenshots
 
@@ -27,18 +27,18 @@ Monica is an open-source web application to organize the interactions with your
 
 ## Documentation and resources
 
-* Official app website: <https://monicahq.com>
+- Official app website: <https://monicahq.com>
-* Upstream app code repository: <https://github.com/monicahq/monica>
+- Upstream app code repository: <https://github.com/monicahq/monica>
-* YunoHost Store: <https://apps.yunohost.org/app/monica>
+- YunoHost Store: <https://apps.yunohost.org/app/monica>
-* Report a bug: <https://github.com/YunoHost-Apps/monica_ynh/issues>
+- Report a bug: <https://github.com/YunoHost-Apps/monica_ynh/issues>
 
 ## Developer info
 
-Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/monica_ynh/tree/testing).
+Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/monica_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/monica_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade monica -u https://github.com/YunoHost-Apps/monica_ynh/tree/testing --debug

README_eu.md

@@ -0,0 +1,47 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Monica YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/monica.svg)](https://dash.yunohost.org/appci/app/monica) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/monica.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/monica.maintain.svg)
+
+[![Instalatu Monica YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monica)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Monica YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Monica is an open-source web application to organize the interactions with your loved ones. I call it a PRM, or Personal Relationship Management. Think of it as a [CRM](https://en.wikipedia.org/wiki/Customer_relationship_management) (a popular tool used by sales teams in the corporate world) for your friends or family.
+
+
+**Paketatutako bertsioa:** 4.1.2~ynh1
+
+## Pantaila-argazkiak
+
+![Monica(r)en pantaila-argazkia](./doc/screenshots/main-app.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://monicahq.com>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/monicahq/monica>
+- YunoHost Denda: <https://apps.yunohost.org/app/monica>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/monica_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/monica_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/monica_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade monica -u https://github.com/YunoHost-Apps/monica_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -1,6 +1,6 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+Nota bene : ce README est automatiquement généré par <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
-It shall NOT be edited by hand.
+Il NE doit PAS être modifié à la main.
 -->
 
 # Monica pour YunoHost
@@ -9,17 +9,17 @@ It shall NOT be edited by hand.
 
 [![Installer Monica avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monica)
 
-*[Read this readme in english.](./README.md)*
+*[Lire le README dans d'autres langues.](./ALL_README.md)*
 
-> *Ce package vous permet d’installer Monica rapidement et simplement sur un serveur YunoHost.
+> *Ce package vous permet d’installer Monica 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.*
+> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.*
 
 ## Vue d’ensemble
 
 Monica is an open-source web application to organize the interactions with your loved ones. I call it a PRM, or Personal Relationship Management. Think of it as a [CRM](https://en.wikipedia.org/wiki/Customer_relationship_management) (a popular tool used by sales teams in the corporate world) for your friends or family.
 
 
-**Version incluse :** 4.0.0~ynh2
+**Version incluse :** 4.1.2~ynh1
 
 ## Captures d’écran
 
@@ -27,21 +27,21 @@ Monica is an open-source web application to organize the interactions with your
 
 ## Documentations et ressources
 
-* Site officiel de l’app : <https://monicahq.com>
+- Site officiel de l’app : <https://monicahq.com>
-* Dépôt de code officiel de l’app : <https://github.com/monicahq/monica>
+- Dépôt de code officiel de l’app : <https://github.com/monicahq/monica>
-* YunoHost Store: <https://apps.yunohost.org/app/monica>
+- YunoHost Store : <https://apps.yunohost.org/app/monica>
-* Signaler un bug : <https://github.com/YunoHost-Apps/monica_ynh/issues>
+- Signaler un bug : <https://github.com/YunoHost-Apps/monica_ynh/issues>
 
 ## Informations pour les développeurs
 
-Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/monica_ynh/tree/testing).
+Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/monica_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/monica_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade monica -u https://github.com/YunoHost-Apps/monica_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>

README_gl.md

@@ -0,0 +1,47 @@
+<!--
+NOTA: Este README foi creado automáticamente por <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+NON debe editarse manualmente.
+-->
+
+# Monica para YunoHost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/monica.svg)](https://dash.yunohost.org/appci/app/monica) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/monica.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/monica.maintain.svg)
+
+[![Instalar Monica con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monica)
+
+*[Le este README en outros idiomas.](./ALL_README.md)*
+
+> *Este paquete permíteche instalar Monica 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
+
+Monica is an open-source web application to organize the interactions with your loved ones. I call it a PRM, or Personal Relationship Management. Think of it as a [CRM](https://en.wikipedia.org/wiki/Customer_relationship_management) (a popular tool used by sales teams in the corporate world) for your friends or family.
+
+
+**Versión proporcionada:** 4.1.2~ynh1
+
+## Capturas de pantalla
+
+![Captura de pantalla de Monica](./doc/screenshots/main-app.png)
+
+## Documentación e recursos
+
+- Web oficial da app: <https://monicahq.com>
+- Repositorio de orixe do código: <https://github.com/monicahq/monica>
+- Tenda YunoHost: <https://apps.yunohost.org/app/monica>
+- Informar dun problema: <https://github.com/YunoHost-Apps/monica_ynh/issues>
+
+## Info de desenvolvemento
+
+Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/monica_ynh/tree/testing).
+
+Para probar a rama `testing`, procede deste xeito:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/monica_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade monica -u https://github.com/YunoHost-Apps/monica_ynh/tree/testing --debug
+```
+
+**Máis info sobre o empaquetado da app:** <https://yunohost.org/packaging_apps>

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.
+-->
+
+# Monica per YunoHost
+
+[![Livello di integrazione](https://dash.yunohost.org/integration/monica.svg)](https://dash.yunohost.org/appci/app/monica) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/monica.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/monica.maintain.svg)
+
+[![Installa Monica con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monica)
+
+*[Leggi questo README in altre lingue.](./ALL_README.md)*
+
+> *Questo pacchetto ti permette di installare Monica 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
+
+Monica is an open-source web application to organize the interactions with your loved ones. I call it a PRM, or Personal Relationship Management. Think of it as a [CRM](https://en.wikipedia.org/wiki/Customer_relationship_management) (a popular tool used by sales teams in the corporate world) for your friends or family.
+
+
+**Versione pubblicata:** 4.0.0~ynh2
+
+## Screenshot
+
+![Screenshot di Monica](./doc/screenshots/main-app.png)
+
+## Documentazione e risorse
+
+- Sito web ufficiale dell’app: <https://monicahq.com>
+- Repository upstream del codice dell’app: <https://github.com/monicahq/monica>
+- Store di YunoHost: <https://apps.yunohost.org/app/monica>
+- Segnala un problema: <https://github.com/YunoHost-Apps/monica_ynh/issues>
+
+## Informazioni per sviluppatori
+
+Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/monica_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/monica_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade monica -u https://github.com/YunoHost-Apps/monica_ynh/tree/testing --debug
+```
+
+**Maggiori informazioni riguardo il pacchetto di quest’app:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -0,0 +1,47 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 Monica
+
+[![集成程度](https://dash.yunohost.org/integration/monica.svg)](https://dash.yunohost.org/appci/app/monica) ![工作状态](https://ci-apps.yunohost.org/ci/badges/monica.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/monica.maintain.svg)
+
+[![使用 YunoHost 安装 Monica](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monica)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Monica。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Monica is an open-source web application to organize the interactions with your loved ones. I call it a PRM, or Personal Relationship Management. Think of it as a [CRM](https://en.wikipedia.org/wiki/Customer_relationship_management) (a popular tool used by sales teams in the corporate world) for your friends or family.
+
+
+**分发版本：** 4.1.2~ynh1
+
+## 截图
+
+![Monica 的截图](./doc/screenshots/main-app.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://monicahq.com>
+- 上游应用代码库： <https://github.com/monicahq/monica>
+- YunoHost 商店： <https://apps.yunohost.org/app/monica>
+- 报告 bug： <https://github.com/YunoHost-Apps/monica_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/monica_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/monica_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade monica -u https://github.com/YunoHost-Apps/monica_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

conf/.env

@@ -22,7 +22,7 @@ HASH_SALT=ChangeMeBy20+KeyLength
 HASH_LENGTH=18
 
 # The URL of your application.
-APP_URL=https://__DOMAIN__
+APP_URL=https://__DOMAIN____PATH__
 
 # Force using APP_URL as base url of your application.
 # You should not need this, unless you are using subdirectory config.
@@ -53,11 +53,11 @@ DB_USE_UTF8MB4=true
 MAIL_DRIVER=smtp
 MAIL_HOST=127.0.0.1
 MAIL_PORT=25
-MAIL_USERNAME=
+MAIL_USERNAME=__APP__
-MAIL_PASSWORD=
+MAIL_PASSWORD=__MAIL_PWD__
 MAIL_ENCRYPTION=
 # Outgoing emails will be sent with these identity
-MAIL_FROM_ADDRESS=monica@__DOMAIN__
+MAIL_FROM_ADDRESS=__APP__@__DOMAIN__
 MAIL_FROM_NAME="Monica"
 # New registration notification sent to this email
 APP_EMAIL_NEW_USERS_NOTIFICATION=__EMAIL__
@@ -136,7 +136,7 @@ AWS_SERVER=
 S3_PATH_STYLE=
 
 # Allow Two Factor Authentication feature on your instance
-MFA_ENABLED=false
+MFA_ENABLED=true
 
 # Enable DAV support
 DAV_ENABLED=true

conf/cron

@@ -1 +1 @@
-* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/artisan schedule:run
+* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/artisan schedule:run >> /dev/null 2>&1

manifest.toml

@@ -5,7 +5,7 @@ name = "Monica"
 description.en = "Personal Relationship Manager"
 description.fr = "Gestionnaire de relations personnelles"
 
-version = "4.0.0~ynh2"
+version = "4.1.2~ynh1"
 
 maintainers = ["Sebastian Gumprich"]
 
@@ -54,11 +54,12 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/monicahq/monica/archive/v4.0.0.zip"
+        url = "https://github.com/monicahq/monica/archive/v4.1.2.zip"
-        sha256 = "5b108525a2f5fedc0a2bb82a49d3de47d087b33082fb21e64f874d387304ed9f"
+        sha256 = "792bb0af6bfb33abd3c4694eed309cf6c33001e589328c418bb1231e063d60d6"
         autoupdate.strategy = "latest_github_tag"
         
     [resources.system_user]
+    allow_email = true
 
     [resources.install_dir]
 
@@ -66,7 +67,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server, php8.1-bcmath, php8.1-cli, php8.1-curl, php8.1-dom, php8.1-gd, php8.1-gmp, php8.1-iconv, php8.1-intl, php8.1-mbstring, php8.1-mysql, php8.1-mysqli, php8.1-opcache, php8.1-redis, php8.1-xml, php8.1-zip"
+    packages = "mariadb-server, php8.2-bcmath, php8.2-cli, php8.2-curl, php8.2-dom, php8.2-gd, php8.2-gmp, php8.2-iconv, php8.2-intl, php8.2-mbstring, php8.2-mysql, php8.2-mysqli, php8.2-opcache, php8.2-redis, php8.2-xml, php8.2-zip"
 
     extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main"
     extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg"

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-#REMOVEME? YNH_PHP_VERSION="8.1"
+#REMOVEME? YNH_PHP_VERSION="8.2"
 
 YNH_COMPOSER_VERSION="2.5.1"
 

scripts/install

@@ -84,9 +84,7 @@ chown $app:$app $install_dir/.env
 #=================================================
 # DEPLOY
 #=================================================
-ynh_script_progression --message="Deploying..."
+ynh_script_progression --message="Deploying $app..."
-
-update-alternatives --set php /usr/bin/php$phpversion
 
 pushd "$install_dir"
 	ynh_use_nodejs
@@ -110,8 +108,6 @@ ynh_store_file_checksum --file="$install_dir/.env"
 chmod 400 "$install_dir/.env"
 chown $app:$app "$install_dir/.env"
 
-update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION}
-
 #=================================================
 # INSTALL THE CRON FILE
 #=================================================

scripts/upgrade

@@ -107,8 +107,6 @@ ynh_add_config --template=".env" --destination="$install_dir/.env"
 #=================================================
 ynh_script_progression --message="Deploying..."
 
-update-alternatives --set php /usr/bin/php$phpversion
-
 pushd "$install_dir"
 	ynh_use_nodejs
 	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn install
@@ -151,7 +149,15 @@ ynh_store_file_checksum --file="$install_dir/.env"
 chmod 400 "$install_dir/.env"
 chown $app:$app "$install_dir/.env"
 
-update-alternatives --set php /usr/bin/php${YNH_PHP_VERSION}
+#=================================================
+# INSTALL THE CRON FILE
+#=================================================
+ynh_script_progression --message="Setuping a cron..." --weight=1
+
+ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
 
 #=================================================
 # END OF SCRIPT