Merge pull request #3 from YunoHost-Apps/testing

Testing
2024-09-03 18:36:03 +02:00 · 2023-01-27 12:31:42 +01:00 · 2023-01-27 12:31:42 +01:00 · c627b0b761
commit c627b0b761
parent 94c7289cf8 74470f163b
10 changed files with 70 additions and 77 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

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

 *[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.


-**Shipped version:** 10.8.5~ynh1
-
-
+**Shipped version:** 11.3.0~ynh1

 ## Screenshots

-![](./doc/screenshots/emoncms_graphic.png)
+![Screenshot of Emoncms](./doc/screenshots/emoncms_graphic.png)

 ## Documentation and resources

-* Official app website: https://emoncms.org/
-* Official admin documentation: https://guide.openenergymonitor.org/
-* Upstream app code repository: https://github.com/emoncms/emoncms
-* YunoHost documentation for this app: https://yunohost.org/app_emoncms
-* Report a bug: https://github.com/YunoHost-Apps/emoncms_ynh/issues
+* Official app website: <https://emoncms.org/>
+* Official admin documentation: <https://guide.openenergymonitor.org/>
+* Upstream app code repository: <https://github.com/emoncms/emoncms>
+* YunoHost documentation for this app: <https://yunohost.org/app_emoncms>
+* Report a bug: <https://github.com/YunoHost-Apps/emoncms_ynh/issues>

 ## Developer info

 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.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug
 or
 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>
--- a/README_fr.md
+++ b/README_fr.md
@ -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

-[![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)

 *[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.
-Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+> *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.*

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


-**Version incluse :** 10.8.5~ynh1
+**Version incluse :** 11.3.0~ynh1

+## Captures d’écran

-
-## Captures d'écran
-
-![](./doc/screenshots/emoncms_graphic.png)
+![Capture d’écran de Emoncms](./doc/screenshots/emoncms_graphic.png)

 ## Documentations et ressources

-* Site officiel de l'app : https://emoncms.org/
-* Documentation officielle de l'admin : https://guide.openenergymonitor.org/
-* Dépôt de code officiel de l'app : https://github.com/emoncms/emoncms
-* Documentation YunoHost pour cette app : https://yunohost.org/app_emoncms
-* Signaler un bug : https://github.com/YunoHost-Apps/emoncms_ynh/issues
+* Site officiel de l’app : <https://emoncms.org/>
+* Documentation officielle de l’admin : <https://guide.openenergymonitor.org/>
+* Dépôt de code officiel de l’app : <https://github.com/emoncms/emoncms>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_emoncms>
+* Signaler un bug : <https://github.com/YunoHost-Apps/emoncms_ynh/issues>

 ## Informations pour les développeurs

 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.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug
 ou
 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>
--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/emoncms/emoncms/archive/refs/tags/10.8.5.tar.gz
-SOURCE_SUM=796f604c011feaaf5a48d4f5756962e5f1af758e8ec744e7acfd9880aa47d87c
+SOURCE_URL=https://github.com/emoncms/emoncms/archive/refs/tags/11.3.0.tar.gz
+SOURCE_SUM=a374ad0a950c5d966b62d54266bf6761d641417785b64fbf6442f7753b386d6f
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/graph.src
+++ b/conf/graph.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/emoncms/graph/archive/refs/tags/2.1.1.tar.gz
-SOURCE_SUM=4224c3f02c9fb525a7d4d07eeafc9de6c2dc79370117e9fa22c2c17abb5226b2
+SOURCE_URL=https://github.com/emoncms/graph/archive/refs/tags/2.2.3.tar.gz
+SOURCE_SUM=a110e881638a07e82b23a5d8df860b49af1e067eb98f4e93a8bad8aebc4ec882
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -1,7 +1,8 @@
-location / {
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location __PATH__/ {

  # Path to source
-  alias __FINALPATH__/ ;
+  alias __FINALPATH__/;

  index index.php;

--- a/manifest.json
+++ b/manifest.json
@ -3,10 +3,10 @@
    "id": "emoncms",
    "packaging_format": 1,
    "description": {
-        "en": "Web-app for 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"
+        "en": "Processing, logging and visualising energy, temperature and other environmental data",
+        "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/",
    "upstream": {
        "license": "GPL-3.0-only",
@ -20,12 +20,12 @@
        "email": ""
    },
    "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.0.9"
    },
    "multi_instance": true,
    "services": [
        "nginx",
-        "php7.3-fpm",
+        "php8.0-fpm",
        "mysql"
    ],
    "arguments": {
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,19 +4,9 @@
 # COMMON VARIABLES
 #=================================================

-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="8.0"

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

-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#=================================================
+pkg_dependencies="$php_dependencies"
--- a/scripts/install
+++ b/scripts/install
@ -85,14 +85,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$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
 #=================================================
@ -101,6 +93,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 # Create a dedicated PHP-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
 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -41,13 +41,6 @@ test ! -d $final_path || ynh_die --message="There is already a directory: $final

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

+#=================================================
+# 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
 #=================================================
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -82,21 +82,13 @@ 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="$final_path" --keep="$final_path/settings.ini"
+	ynh_setup_source --dest_dir="$final_path" --keep="settings.ini"
 fi

 chmod 750 "$final_path"
 chmod -R o-rwx "$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
 #=================================================
@ -112,6 +104,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 # Create a dedicated PHP-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
 #=================================================