From 8be3164aac2a5ed096349e9bd132731557a66422 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sat, 8 Apr 2023 13:33:16 +0200 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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]