From 8be3164aac2a5ed096349e9bd132731557a66422 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sat, 8 Apr 2023 13:33:16 +0200 Subject: [PATCH 01/10] Fix site base URL, enable sending e-mails and MFA --- conf/.env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/.env b/conf/.env index 3504a87..1bc9b35 100644 --- a/conf/.env +++ b/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. @@ -50,7 +50,7 @@ DB_TEST_PASSWORD=secret DB_USE_UTF8MB4=true # Mail credentials used to send emails from the application. -MAIL_DRIVER=smtp +MAIL_DRIVER=sendmail MAIL_HOST=127.0.0.1 MAIL_PORT=25 MAIL_USERNAME= @@ -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 From fe6b8dad12a663ee3574e1b41c643776e3a872f0 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sat, 8 Apr 2023 13:33:34 +0200 Subject: [PATCH 02/10] Silent cron as per documentation --- conf/cron | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cron b/conf/cron index 597d231..a5f4c63 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/artisan schedule:run \ No newline at end of file +* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/artisan schedule:run >> /dev/null 2>&1 \ No newline at end of file From f3a2a158168f58f7a18f946fbf704dace4de0a33 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sat, 8 Apr 2023 13:34:00 +0200 Subject: [PATCH 03/10] Enable updating cron file during upgrade --- scripts/upgrade | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index e8547b1..be04ef0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -158,6 +158,16 @@ chown $app:$app "$install_dir/.env" update-alternatives --set php /usr/bin/php${YNH_DEFAULT_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 #================================================= From bbaca933fee7dc15c937c7577181c6adbb24df28 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sat, 8 Apr 2023 13:34:25 +0200 Subject: [PATCH 04/10] Bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 3662a7e..ce08b00 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Monica" description.en = "Personal Relationship Manager" description.fr = "Gestionnaire de relations personnelles" -version = "4.0.0~ynh1" +version = "4.0.0~ynh2" maintainers = ["Sebastian Gumprich"] From 3a8600313b471bef81bac623b17b88005585d273 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 8 Apr 2023 11:37:54 +0000 Subject: [PATCH 05/10] Auto-update README --- README.md | 6 +----- README_fr.md | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0e1dd5e..57086ed 100644 --- a/README.md +++ b/README.md @@ -19,16 +19,12 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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~ynh1 +**Shipped version:** 4.0.0~ynh2 ## Screenshots ![Screenshot of Monica](./doc/screenshots/main-app.png) -## :red_circle: Antifeatures - -- **Package not maintained**: This YunoHost package is not maintained and needs adoption. - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 4e5b64e..f293b1a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,16 +19,12 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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~ynh1 +**Version incluse :** 4.0.0~ynh2 ## Captures d’écran ![Capture d’écran de Monica](./doc/screenshots/main-app.png) -## :red_circle: Fonctions indésirables - -- **Package not maintained**: This YunoHost package is not maintained and needs adoption. - ## Documentations et ressources * Site officiel de l’app : From a031828f6760c66dce4f522811c3793980bf10b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:14:06 +0100 Subject: [PATCH 06/10] Add mail smtp --- conf/.env | 8 ++++---- manifest.toml | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/.env b/conf/.env index 1bc9b35..9f586c4 100644 --- a/conf/.env +++ b/conf/.env @@ -50,14 +50,14 @@ DB_TEST_PASSWORD=secret DB_USE_UTF8MB4=true # Mail credentials used to send emails from the application. -MAIL_DRIVER=sendmail +MAIL_DRIVER=smtp MAIL_HOST=127.0.0.1 MAIL_PORT=25 -MAIL_USERNAME= -MAIL_PASSWORD= +MAIL_USERNAME=__APP__ +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__ diff --git a/manifest.toml b/manifest.toml index 192eb9e..638225f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -59,6 +59,7 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_tag" [resources.system_user] + allow_email = true [resources.install_dir] From b463f08ef222e3d95e730a1e7372a0e46dbfdb0d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Sat, 2 Dec 2023 16:58:02 +0100 Subject: [PATCH 07/10] Update manifest.toml: bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 638225f..2fb1329 100644 --- a/manifest.toml +++ b/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.0.0~ynh3" maintainers = ["Sebastian Gumprich"] From 442cd9745c008f1affb4295a88b9be63bf9cfcb9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 2 Dec 2023 15:58:06 +0000 Subject: [PATCH 08/10] 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 88bdaa2..6caee28 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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.0.0~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 869f8da..ccbf6f8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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.0.0~ynh3 ## Captures d’écran From 33e53806d11dbaf16f92594861e93e2dbd2ca311 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 1 May 2024 21:10:51 +0200 Subject: [PATCH 09/10] No need for update-alternatives --- scripts/install | 4 ---- scripts/upgrade | 4 ---- 2 files changed, 8 deletions(-) diff --git a/scripts/install b/scripts/install index ce15a03..15fa755 100755 --- a/scripts/install +++ b/scripts/install @@ -86,8 +86,6 @@ chown $app:$app $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 @@ -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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b53a999..aea1ed3 100755 --- a/scripts/upgrade +++ b/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,8 +149,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_PHP_VERSION} - #================================================= # INSTALL THE CRON FILE #================================================= From e677a769fd03f94cdfc442f7cde57ea478ed61b8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 1 May 2024 19:11:02 +0000 Subject: [PATCH 10/10] Auto-update READMEs --- ALL_README.md | 7 +++++++ README.md | 22 +++++++++++----------- README_eu.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 28 ++++++++++++++-------------- README_gl.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 173 insertions(+), 25 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..a01b345 --- /dev/null +++ b/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) diff --git a/README.md b/README.md index 6caee28..a0fbd8f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ 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. -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 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.* ## Overview @@ -27,18 +27,18 @@ Monica is an open-source web application to organize the interactions with your ## Documentation and resources -* Official app website: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## 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 diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..805d6ff --- /dev/null +++ b/README_eu.md @@ -0,0 +1,47 @@ + + +# 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.0.0~ynh3 + +## Pantaila-argazkiak + +![Monica(r)en pantaila-argazkia](./doc/screenshots/main-app.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## 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:** diff --git a/README_fr.md b/README_fr.md index ccbf6f8..97245eb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # 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. -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 Monica 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 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~ynh3 +**Version incluse :** 4.0.0~ynh3 ## 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 : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## 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 :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..d75b138 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,47 @@ + + +# 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.0.0~ynh3 + +## Capturas de pantalla + +![Captura de pantalla de Monica](./doc/screenshots/main-app.png) + +## Documentación e recursos + +- Web oficial da app: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## 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:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..26b2499 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,47 @@ + + +# 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.0.0~ynh3 + +## 截图 + +![Monica 的截图](./doc/screenshots/main-app.png) + +## 文档与资源 + +- 官方应用网站： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`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 +``` + +**有关应用打包的更多信息：**