YunoHost-Apps/emoncms_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/emoncms_ynh.git synced 2024-09-03 18:36:03 +02:00
Code Issues Activity Actions

Merge pull request #3 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2023-01-27 12:31:42 +01:00 committed by GitHub
commit c627b0b761
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 70 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Emoncms for YunoHost # Emoncms for YunoHost
[![Integration level](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![Working status](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg)
[![Install Emoncms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms) [![Install Emoncms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -18,31 +18,30 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project. Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project.
**Shipped version:** 10.8.5~ynh1 **Shipped version:** 11.3.0~ynh1
## Screenshots ## Screenshots
![](./doc/screenshots/emoncms_graphic.png) ![Screenshot of Emoncms](./doc/screenshots/emoncms_graphic.png)
## Documentation and resources ## Documentation and resources
* Official app website: https://emoncms.org/ * Official app website: <https://emoncms.org/>
* Official admin documentation: https://guide.openenergymonitor.org/ * Official admin documentation: <https://guide.openenergymonitor.org/>
* Upstream app code repository: https://github.com/emoncms/emoncms * Upstream app code repository: <https://github.com/emoncms/emoncms>
* YunoHost documentation for this app: https://yunohost.org/app_emoncms * YunoHost documentation for this app: <https://yunohost.org/app_emoncms>
* Report a bug: https://github.com/YunoHost-Apps/emoncms_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/emoncms_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug
or or
sudo yunohost app upgrade emoncms -u https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug sudo yunohost app upgrade emoncms -u https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

37
README_fr.md
View file

@ -1,44 +1,47 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# Emoncms pour YunoHost # Emoncms pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) [![Niveau d’intégration](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg)
[![Installer Emoncms avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms) [![Installer Emoncms avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Emoncms rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d’installer Emoncms 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.* Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.*
## Vue d'ensemble ## Vue d’ensemble
Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project. Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project.
**Version incluse :** 10.8.5~ynh1 **Version incluse :** 11.3.0~ynh1
## Captures d’écran
![Capture d’écran de Emoncms](./doc/screenshots/emoncms_graphic.png)
## Captures d'écran
![](./doc/screenshots/emoncms_graphic.png)
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : https://emoncms.org/ * Site officiel de l’app : <https://emoncms.org/>
* Documentation officielle de l'admin : https://guide.openenergymonitor.org/ * Documentation officielle de l’admin : <https://guide.openenergymonitor.org/>
* Dépôt de code officiel de l'app : https://github.com/emoncms/emoncms * Dépôt de code officiel de l’app : <https://github.com/emoncms/emoncms>
* Documentation YunoHost pour cette app : https://yunohost.org/app_emoncms * Documentation YunoHost pour cette app : <https://yunohost.org/app_emoncms>
* Signaler un bug : https://github.com/YunoHost-Apps/emoncms_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/emoncms_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade emoncms -u https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug sudo yunohost app upgrade emoncms -u https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps **Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/emoncms/emoncms/archive/refs/tags/10.8.5.tar.gz SOURCE_URL=https://github.com/emoncms/emoncms/archive/refs/tags/11.3.0.tar.gz
SOURCE_SUM=796f604c011feaaf5a48d4f5756962e5f1af758e8ec744e7acfd9880aa47d87c SOURCE_SUM=a374ad0a950c5d966b62d54266bf6761d641417785b64fbf6442f7753b386d6f
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
conf/graph.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/emoncms/graph/archive/refs/tags/2.1.1.tar.gz SOURCE_URL=https://github.com/emoncms/graph/archive/refs/tags/2.2.3.tar.gz
SOURCE_SUM=4224c3f02c9fb525a7d4d07eeafc9de6c2dc79370117e9fa22c2c17abb5226b2 SOURCE_SUM=a110e881638a07e82b23a5d8df860b49af1e067eb98f4e93a8bad8aebc4ec882
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=false

5
conf/nginx.conf
View file

@ -1,7 +1,8 @@
location / { #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ {
# Path to source # Path to source
alias __FINALPATH__/ ; alias __FINALPATH__/;
index index.php; index index.php;

10
manifest.json
View file

@ -3,10 +3,10 @@
"id": "emoncms", "id": "emoncms",
"packaging_format": 1, "packaging_format": 1,
"description": { "description": {
"en": "Web-app for processing, logging and visualising energy, temperature and other environmental data", "en": "Processing, logging and visualising energy, temperature and other environmental data",
"fr": "Application Web pour le traitement, l'enregistrement et la visualisation de l'énergie, de la température et d'autres données environnementales" "fr": "Traitement enregistrement et la visualisation de l'énergie, de la température et d'autres données environnementales"
}, },
"version": "10.8.5~ynh1", "version": "11.3.0~ynh1",
"url": "https://emoncms.org/", "url": "https://emoncms.org/",
"upstream": { "upstream": {
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
@ -20,12 +20,12 @@
"email": "" "email": ""
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.3.0" "yunohost": ">= 11.0.9"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php7.3-fpm", "php8.0-fpm",
"mysql" "mysql"
], ],
"arguments": { "arguments": {

16
scripts/_common.sh
View file

@ -4,19 +4,9 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
YNH_PHP_VERSION="7.4" YNH_PHP_VERSION="8.0"
# dependencies used by the app # dependencies used by the app
pkg_dependencies="php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-mysql" php_dependencies="php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-mysql"
#================================================= pkg_dependencies="$php_dependencies"
# PERSONAL HELPERS
#=================================================
#=================================================
# EXPERIMENTAL HELPERS
#=================================================
#=================================================
# FUTURE OFFICIAL HELPERS
#=================================================

16
scripts/install
View file

@ -85,14 +85,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring NGINX web server..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# PHP-FPM CONFIGURATION # PHP-FPM CONFIGURATION
#================================================= #=================================================
@ -101,6 +93,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config ynh_add_fpm_config
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring NGINX web server..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# CREATE DATA DIRECTORY # CREATE DATA DIRECTORY
#================================================= #=================================================

14
scripts/restore
View file

@ -41,13 +41,6 @@ test ! -d $final_path || ynh_die --message="There is already a directory: $final
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RECREATE THE DEDICATED USER # RECREATE THE DEDICATED USER
#================================================= #=================================================
@ -87,6 +80,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# SPECIFIC RESTORATION # SPECIFIC RESTORATION
#================================================= #=================================================

18
scripts/upgrade
View file

@ -82,21 +82,13 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" --keep="$final_path/settings.ini" ynh_setup_source --dest_dir="$final_path" --keep="settings.ini"
fi fi
chmod 750 "$final_path" chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# UPGRADE DEPENDENCIES # UPGRADE DEPENDENCIES
#================================================= #=================================================
@ -112,6 +104,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config ynh_add_fpm_config
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# UPDATE A CONFIG FILE # UPDATE A CONFIG FILE
#================================================= #=================================================