Merge pull request #74 from YunoHost-Apps/testing

ALL_README.md

@@ -1,6 +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)
-- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -9,7 +9,7 @@ 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)
 
-*[Read this README is other languages.](./ALL_README.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.*
@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 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
 

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.0.0~ynh3
+
+## 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

@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 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
 

README_gl.md

@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 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~ynh2
+**Versión proporcionada:** 4.0.0~ynh3
 
 ## Capturas de pantalla
 

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.0.0~ynh3
+
+## 截图
+
+![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.0.0~ynh3"
 
 maintainers = ["Sebastian Gumprich"]
 
@@ -59,6 +59,7 @@ ram.runtime = "50M"
         autoupdate.strategy = "latest_github_tag"
         
     [resources.system_user]
+    allow_email = true
 
     [resources.install_dir]
 

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
 #=================================================

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