1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/monica_ynh.git synced 2024-09-03 19:46:23 +02:00

Merge pull request #84 from YunoHost-Apps/testing

Testing
This commit is contained in:
eric_G 2024-06-17 23:35:52 +02:00 committed by GitHub
commit 8a8fa1a11d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 101 additions and 121 deletions

View file

@ -1,6 +1,7 @@
# 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)

View file

@ -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~ynh3
**Shipped version:** 4.1.2~ynh1
## Screenshots

47
README_es.md Normal file
View file

@ -0,0 +1,47 @@
<!--
Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
No se debe editar a mano.
-->
# Monica para Yunohost
[![Nivel de integración](https://dash.yunohost.org/integration/monica.svg)](https://dash.yunohost.org/appci/app/monica) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/monica.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/monica.maintain.svg)
[![Instalar Monica con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monica)
*[Leer este README en otros idiomas.](./ALL_README.md)*
> *Este paquete le permite instalarMonica 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
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 actual:** 4.1.2~ynh1
## Capturas
![Captura de Monica](./doc/screenshots/main-app.png)
## Documentaciones y recursos
- Sitio web oficial: <https://monicahq.com>
- Repositorio del código fuente oficial de la aplicación : <https://github.com/monicahq/monica>
- Catálogo YunoHost: <https://apps.yunohost.org/app/monica>
- Reportar un error: <https://github.com/YunoHost-Apps/monica_ynh/issues>
## Información para desarrolladores
Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/monica_ynh/tree/testing
Para probar la rama `testing`, sigue asÍ:
```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
```
**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

View file

@ -19,7 +19,7 @@ EZ editatu eskuz.
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
**Paketatutako bertsioa:** 4.1.2~ynh1
## Pantaila-argazkiak

View file

@ -16,10 +16,9 @@ Il NE doit PAS être modifié à la main.
## Vue densemble
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.
Monica est une application web open source pour organiser les interactions avec vos proches. J'appelle cela Gestion des Relations Personnelles. Considérez-le comme un [CRM](https://en.wikipedia.org/wiki/Customer_relationship_management) (un outil populaire utilisé par les équipes commerciales du monde de l'entreprise) pour vos amis ou votre famille.
**Version incluse:** 4.0.0~ynh3
**Version incluse:** 4.1.2~ynh1
## Captures décran

View file

@ -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~ynh3
**Versión proporcionada:** 4.1.2~ynh1
## Capturas de pantalla

View file

@ -3,7 +3,7 @@
请勿手动编辑。
-->
# YunoHost 的 Monica
# 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)
@ -19,7 +19,7 @@
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
**分发版本:** 4.1.2~ynh1
## 截图

View file

@ -1,29 +0,0 @@
;; Test complet
; Manifest
domain="domain.tld"
path="/path"
is_public=1
language="fr"
admin="john"
password="1Strong-Password"
; Checks
pkg_linter=1
setup_sub_dir=1
setup_root=1
setup_nourl=0
setup_private=1
setup_public=1
upgrade=1
# 3.7.0~ynh2
upgrade=1 from_commit=272460bc0f447d859dc4058f4977119892fa7a9e
backup_restore=1
multi_instance=1
port_already_use=0
change_url=0
;;; Options
Email=
Notification=none
;;; Upgrade options
; commit=272460bc0f447d859dc4058f4977119892fa7a9e
name=Merge pull request #64
manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666&

View file

@ -4,7 +4,7 @@
# Two choices: local|production. Use local if you want to install Monica as a
# development version. Use production otherwise.
APP_ENV=local
APP_ENV=production
# true if you want to show debug information on errors. For production, put this
# to false.

3
doc/ADMIN_fr.md Normal file
View file

@ -0,0 +1,3 @@
* Vous pouvez vous connecter en utilisant l'adresse e-mail de l'utilisateur choisi lors de l'installation et le mot de passe fourni lors de l'installation
* Les nouvelles inscriptions sont désactivées, vous pouvez ouvrir le registre pour tous en changeant la valeur **APP_DISABLE_SIGNUP** en **false** dans **.env**.
* Il n'y a **pas d'interface d'administration** dans l'application Monica actuellement.

1
doc/DESCRIPTION_fr.md Normal file
View file

@ -0,0 +1 @@
Monica est une application web open source pour organiser les interactions avec vos proches. J'appelle cela Gestion des Relations Personnelles. Considérez-le comme un [CRM](https://en.wikipedia.org/wiki/Customer_relationship_management) (un outil populaire utilisé par les équipes commerciales du monde de l'entreprise) pour vos amis ou votre famille.

View file

@ -5,7 +5,7 @@ name = "Monica"
description.en = "Personal Relationship Manager"
description.fr = "Gestionnaire de relations personnelles"
version = "4.0.0~ynh3"
version = "4.1.2~ynh1"
maintainers = ["Sebastian Gumprich"]
@ -18,8 +18,11 @@ code = "https://github.com/monicahq/monica"
yunohost = ">= 11.2"
architectures = "all"
multi_instance = true
ldap = false
sso = false
disk = "50M"
ram.build = "50M"
ram.runtime = "50M"
@ -54,8 +57,8 @@ ram.runtime = "50M"
[resources.sources]
[resources.sources.main]
url = "https://github.com/monicahq/monica/archive/v4.0.0.zip"
sha256 = "5b108525a2f5fedc0a2bb82a49d3de47d087b33082fb21e64f874d387304ed9f"
url = "https://github.com/monicahq/monica/archive/v4.1.2.zip"
sha256 = "792bb0af6bfb33abd3c4694eed309cf6c33001e589328c418bb1231e063d60d6"
autoupdate.strategy = "latest_github_tag"
[resources.system_user]
@ -67,7 +70,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"

View file

@ -4,11 +4,9 @@
# COMMON VARIABLES
#=================================================
#REMOVEME? YNH_PHP_VERSION="8.1"
YNH_COMPOSER_VERSION="2.6.5"
YNH_COMPOSER_VERSION="2.5.1"
NODEJS_VERSION=18
NODEJS_VERSION="20"
#=================================================
# PERSONAL HELPERS

View file

@ -22,21 +22,13 @@ ynh_print_info --message="Declaring files to be backed up..."
ynh_backup --src_path="$install_dir"
#=================================================
# BACKUP THE NGINX CONFIGURATION
# SYSTEM CONFIGURATION
#=================================================
ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#=================================================
# BACKUP THE PHP-FPM CONFIGURATION
#=================================================
ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
#=================================================
# BACKUP VARIOUS FILES
#=================================================
ynh_backup --src_path="/etc/cron.d/$app"
#=================================================

View file

@ -25,6 +25,7 @@ ynh_change_url_nginx_config
# Run monica update
pushd "$install_dir"
/usr/bin/php$phpversion artisan monica:update --force
/usr/bin/php$phpversion artisan optimize:clear
popd
#=================================================

View file

@ -15,18 +15,12 @@ source /usr/share/yunohost/helpers
random_key=$(ynh_string_random --length=32)
email=$(ynh_user_get_info --username=$admin --key="mail")
fpm_footprint="low"
fpm_free_footprint=0
fpm_usage="low"
#=================================================
# STORE SETTINGS FROM MANIFEST
#=================================================
ynh_app_setting_set --app=$app --key=random_key --value=$random_key
ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
#=================================================
# STANDARD MODIFICATIONS
@ -53,7 +47,7 @@ chown -R $app:www-data "$install_dir"
#=================================================
ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
ynh_add_fpm_config
# Create a dedicated NGINX config
ynh_add_nginx_config
@ -63,7 +57,7 @@ ynh_add_nginx_config
#=================================================
# INSTALL COMPOSER DEPENDENCIES
#=================================================
#REMOVEME? ynh_script_progression --message="Installing composer dependencies..."
ynh_script_progression --message="Installing composer dependencies..."
ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir"
@ -81,6 +75,13 @@ ynh_add_config --template=".env" --destination="$install_dir/.env"
chmod 600 $install_dir/.env
chown $app:$app $install_dir/.env
#==================================================
# FIX PHP VERSION
#==================================================
ynh_script_progression --message="Fixing php version in package.json..." --weight=1
ynh_replace_string --target_file="$install_dir/package.json" --match_string="php artisan lang:generate -vvv" --replace_string="php$phpversion artisan lang:generate -vvv"
#=================================================
# DEPLOY
#=================================================
@ -100,6 +101,7 @@ pushd "$install_dir"
ynh_app_setting_set --app=$app --key=mobile_key --value=$mobile_key
ynh_secure_remove --file="$install_dir/key.txt"
ynh_exec_warn_less ynh_exec_as $app php$phpversion artisan config:cache
ynh_exec_warn_less ynh_exec_as $app php$phpversion artisan optimize:clear
popd
# Calculate and store the config file checksum into the app settings

View file

@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
#=================================================
# REMOVE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
# Remove the dedicated NGINX config
ynh_remove_nginx_config

View file

@ -40,7 +40,7 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the PHP-FPM configuration..."
ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"

View file

@ -15,48 +15,13 @@ source /usr/share/yunohost/helpers
email=$(ynh_user_get_info --username=$admin --key=mail)
#=================================================
# CHECK VERSION
#=================================================
upgrade_type=$(ynh_check_app_version_changed)
#=================================================
# STANDARD UPGRADE STEPS
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
#=================================================
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
# If fpm_footprint doesn't exist, create it
if [ -z "${fpm_footprint:-}" ]; then
fpm_footprint=low
ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
fi
# If fpm_free_footprint doesn't exist, create it
if [ -z "${fpm_free_footprint:-}" ]; then
fpm_free_footprint=0
ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
fi
# If fpm_usage doesn't exist, create it
if [ -z "${fpm_usage:-}" ]; then
fpm_usage=low
ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
fi
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
if [ "$upgrade_type" == "UPGRADE_APP" ]
then
ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" --keep=".env"
fi
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
@ -71,10 +36,9 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
#=================================================
# PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
ynh_script_progression --message="Updating $app's configuration files..." --weight=1
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
ynh_add_fpm_config
# Create a dedicated NGINX config
ynh_add_nginx_config
@ -102,6 +66,13 @@ ynh_backup_if_checksum_is_different --file="$install_dir/.env"
ynh_add_config --template=".env" --destination="$install_dir/.env"
#==================================================
# FIX PHP VERSION
#==================================================
ynh_script_progression --message="Fixing php version in package.json..." --weight=1
ynh_replace_string --target_file="$install_dir/package.json" --match_string="php artisan lang:generate -vvv" --replace_string="php$phpversion artisan lang:generate -vvv"
#=================================================
# DEPLOYMENT
#=================================================
@ -136,13 +107,6 @@ pushd "$install_dir"
ynh_exec_warn_less ynh_exec_as $app php$phpversion artisan config:cache
popd
#if ynh_version_gt "2.15.0" "${previous_version}" ; then
# ynh_script_progression --message="Upgrading for 2.15.0..."
# pushd "$install_dir"
# ynh_exec_warn_less ynh_exec_as $app php$phpversion artisan monica:moveavatarstophotosdirectory
# popd
#fi
# Calculate and store the config file checksum into the app settings
ynh_store_file_checksum --file="$install_dir/.env"
@ -154,7 +118,7 @@ chown $app:$app "$install_dir/.env"
#=================================================
ynh_script_progression --message="Setuping a cron..." --weight=1
ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
chown root: "/etc/cron.d/$app"
chmod 644 "/etc/cron.d/$app"

View file

@ -1,5 +1,3 @@
test_format = 1.0
[default]
test_upgrade_from.272460bc.name = "Upgrade from 3.7.0~ynh2"