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

Merge pull request #3 from YunoHost-Apps/linter

Linter
This commit is contained in:
Éric Gaspar 2023-01-23 21:16:22 +01:00 committed by GitHub
commit e4417cfbe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 38 additions and 39 deletions

View file

@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
It shall NOT be edited by hand.
-->
# Moncycle.app for YunoHost
# Moncycle for YunoHost
[![Integration level](https://dash.yunohost.org/integration/moncycle_app.svg)](https://dash.yunohost.org/appci/app/moncycle_app) ![Working status](https://ci-apps.yunohost.org/ci/badges/moncycle_app.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/moncycle_app.maintain.svg)
[![Install Moncycle.app with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle_app)
[![Integration level](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![Working status](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg)
[![Install Moncycle with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle)
*[Lire ce readme en français.](./README_fr.md)*
> *This package allows you to install Moncycle.app quickly and simply on a YunoHost server.
> *This package allows you to install Moncycle 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
@ -62,7 +62,7 @@ Il existe plusieurs méthodes proposées par différentes associations. Voici un
## Screenshots
![Screenshot of Moncycle.app](./doc/screenshots/moncycle_app.png)
![Screenshot of Moncycle](./doc/screenshots/moncycle_app.png)
## Disclaimers / important information
@ -77,19 +77,19 @@ Il existe plusieurs méthodes proposées par différentes associations. Voici un
* Official user documentation: <https://www.moncycle.app>
* Official admin documentation: <https://github.com/jean-io/moncycle.app>
* Upstream app code repository: <https://github.com/jean-io/moncycle.app>
* YunoHost documentation for this app: <https://yunohost.org/app_moncycle_app>
* Report a bug: <https://github.com/YunoHost-Apps/moncycle_app_ynh/issues>
* YunoHost documentation for this app: <https://yunohost.org/app_moncycle>
* Report a bug: <https://github.com/YunoHost-Apps/moncycle_ynh/issues>
## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/moncycle_app_ynh/tree/testing).
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/moncycle_ynh/tree/testing).
To try the testing branch, please proceed like that.
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/moncycle_app_ynh/tree/testing --debug
sudo yunohost app install https://github.com/YunoHost-Apps/moncycle_ynh/tree/testing --debug
or
sudo yunohost app upgrade moncycle_app -u https://github.com/YunoHost-Apps/moncycle_app_ynh/tree/testing --debug
sudo yunohost app upgrade moncycle -u https://github.com/YunoHost-Apps/moncycle_ynh/tree/testing --debug
```
**More info regarding app packaging:** <https://yunohost.org/packaging_apps>

View file

@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
It shall NOT be edited by hand.
-->
# Moncycle.app pour YunoHost
# Moncycle pour YunoHost
[![Niveau dintégration](https://dash.yunohost.org/integration/moncycle_app.svg)](https://dash.yunohost.org/appci/app/moncycle_app) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/moncycle_app.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/moncycle_app.maintain.svg)
[![Installer Moncycle.app avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle_app)
[![Niveau dintégration](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg)
[![Installer Moncycle avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle)
*[Read this readme in english.](./README.md)*
> *Ce package vous permet dinstaller Moncycle.app rapidement et simplement sur un serveur YunoHost.
> *Ce package vous permet dinstaller Moncycle rapidement et simplement sur un serveur YunoHost.
Si vous navez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment linstaller et en profiter.*
## Vue densemble
@ -62,7 +62,7 @@ Il existe plusieurs méthodes proposées par différentes associations. Voici un
## Captures décran
![Capture décran de Moncycle.app](./doc/screenshots/moncycle_app.png)
![Capture décran de Moncycle](./doc/screenshots/moncycle_app.png)
## Avertissements / informations importantes
@ -77,19 +77,19 @@ Il existe plusieurs méthodes proposées par différentes associations. Voici un
* Documentation officielle utilisateur : <https://www.moncycle.app>
* Documentation officielle de ladmin : <https://github.com/jean-io/moncycle.app>
* Dépôt de code officiel de lapp : <https://github.com/jean-io/moncycle.app>
* Documentation YunoHost pour cette app : <https://yunohost.org/app_moncycle_app>
* Signaler un bug : <https://github.com/YunoHost-Apps/moncycle_app_ynh/issues>
* Documentation YunoHost pour cette app : <https://yunohost.org/app_moncycle>
* Signaler un bug : <https://github.com/YunoHost-Apps/moncycle_ynh/issues>
## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/moncycle_app_ynh/tree/testing).
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/moncycle_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit.
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/moncycle_app_ynh/tree/testing --debug
sudo yunohost app install https://github.com/YunoHost-Apps/moncycle_ynh/tree/testing --debug
ou
sudo yunohost app upgrade moncycle_app -u https://github.com/YunoHost-Apps/moncycle_app_ynh/tree/testing --debug
sudo yunohost app upgrade moncycle -u https://github.com/YunoHost-Apps/moncycle_ynh/tree/testing --debug
```
**Plus dinfos sur le packaging dapplications :** <https://yunohost.org/packaging_apps>

View file

@ -8,8 +8,8 @@
*/
define("DB_HOST", "localhost");
define("DB_ID", "__APP__");
define("DB_NAME", "__APP__");
define("DB_ID", "__DB_USER__");
define("DB_NAME", "__DB_NAME__");
define("DB_PORT", 3306);
define("DB_PASSWORD", "__DB_PWD__");

View file

@ -1,10 +1,10 @@
{
"name": "Moncycle.app",
"id": "moncycle_app",
"name": "Moncycle",
"id": "moncycle",
"packaging_format": 1,
"description": {
"en": "Menstrual cycle follow-up application for natural family planning",
"fr": "Application de suivi de cycle pour les méthodes naturelles de régulation de naissance."
"en": "Menstrual cycle follow-up for natural family planning",
"fr": "Suivi de cycle pour les méthodes naturelles de régulation de naissance"
},
"version": "7.0~ynh1",
"url": "https://moncycle.app",
@ -38,8 +38,8 @@
{
"name": "path",
"type": "path",
"example": "/example",
"default": "/example"
"example": "/moncycle",
"default": "/moncycle"
},
{
"name": "is_public",

View file

@ -92,8 +92,8 @@ chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path"
pushd "$final_path"
ynh_exec_warn_less sudo -u $app mv ./www_data/* .
ynh_exec_warn_less sudo -u $app ./module/install.sh
ynh_exec_warn_less mv ./www_data/* .
ynh_exec_warn_less ./module/install.sh
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < db/table.sql
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < db/demo.sql
popd

View file

@ -86,14 +86,14 @@ ynh_install_app_dependencies $pkg_dependencies
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the PHP-FPM configuration..." --time --weight=1
ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1
ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"

View file

@ -58,10 +58,9 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
# Remove www file
pushd "$final_path"
ynh_exec_warn_less sudo -u $app rm -rf *
popd
# Void and recreate final_path
ynh_secure_remove --file="$final_path"
ynh_exec_warn_less mkdir "$final_path"
if [ "$upgrade_type" == "UPGRADE_APP" ]
then
@ -76,8 +75,8 @@ chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path"
pushd "$final_path"
ynh_exec_warn_less sudo -u $app mv ./www_data/* .
ynh_exec_warn_less sudo -u $app ./module/install.sh
ynh_exec_warn_less mv ./www_data/* .
ynh_exec_warn_less ./module/install.sh
popd
#=================================================
@ -98,7 +97,7 @@ ynh_add_fpm_config
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config