Merge pull request #58 from YunoHost-Apps/testing

Testing

README.md

@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**Shipped version:** 5.0.20~ynh2
+**Shipped version:** 5.0.38~ynh1
 
 ## Screenshots
 
@@ -40,7 +40,6 @@ A monitoring tool for diverse IT components, including networks, servers, VMs an
 * Official app website: <https://www.zabbix.com>
 * Official admin documentation: <https://www.zabbix.com/manuals>
 * Upstream app code repository: <https://github.com/zabbix/zabbix>
-* YunoHost documentation for this app: <https://yunohost.org/app_zabbix>
 * Report a bug: <https://github.com/YunoHost-Apps/zabbix_ynh/issues>
 
 ## Developer info

README_fr.md

@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Un outil de surveillance pour divers composants informatiques, notamment les réseaux, les serveurs, les machines virtuelles et les services en nuage.
 
 
-**Version incluse :** 5.0.20~ynh2
+**Version incluse :** 5.0.38~ynh1
 
 ## Captures d’écran
 
@@ -40,7 +40,6 @@ Un outil de surveillance pour divers composants informatiques, notamment les ré
 * Site officiel de l’app : <https://www.zabbix.com>
 * Documentation officielle de l’admin : <https://www.zabbix.com/manuals>
 * Dépôt de code officiel de l’app : <https://github.com/zabbix/zabbix>
-* Documentation YunoHost pour cette app : <https://yunohost.org/app_zabbix>
 * Signaler un bug : <https://github.com/YunoHost-Apps/zabbix_ynh/issues>
 
 ## Informations pour les développeurs

check_process

@@ -15,20 +15,15 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		# 4.4~ynh1
-		upgrade=1	from_commit=5cd502c98fdf4731938503541cf64a59aa43eda7
-		# 4.4~ynh3
-		upgrade=1	from_commit=9c1395710db75a5af897edc6ce6bcc8b1fc2d167
+		# 5.0.20~ynh2
+		upgrade=1	from_commit=8f8961c239f890069c867e40005db98465add0c9
 		backup_restore=1
 		multi_instance=0
-		port_already_use=1
 		change_url=1
 ;;; Options
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=5cd502c98fdf4731938503541cf64a59aa43eda7
-		name=4.4~ynh1.
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=PORT&
-	; commit=9c1395710db75a5af897edc6ce6bcc8b1fc2d167
-		name=4.4~ynh3
+	; commit=8f8961c239f890069c867e40005db98465add0c9
+		name=5.0.20~ynh2

manifest.json

@@ -6,7 +6,7 @@
         "en": "Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services",
         "fr": "Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne"
     },
-    "version": "5.0.20~ynh2",
+    "version": "5.0.38~ynh1",
     "url": "https://www.zabbix.com",
     "upstream": {
         "license": "GPL-2.0-or-later",
@@ -20,12 +20,12 @@
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.2"
     },
     "multi_instance": false,
     "services": [
         "nginx",
-        "php7.3-fpm",
+        "php7.4-fpm",
         "mysql"
     ],
     "arguments": {
@@ -51,12 +51,28 @@
             },
             {
                 "name": "language",
-                "type": "string",
+                "type": "select",
                 "ask": {
                     "en": "Choose the application language",
                     "fr": "Choisissez la langue de l'application"
                 },
-                "choices": ["en_GB", "en_US", "cz_CN", "cs_CZ", "fr_FR", "ko_KR", "ja_JP", "nb_NO", "pl_PL", "pt_BR", "pt_PT", "ru_RU", "sk_SK", "tr_TR", "uk_UA"],
+                "choices": [
+                    "en_GB",
+                    "en_US",
+                    "cz_CN",
+                    "cs_CZ",
+                    "fr_FR",
+                    "ko_KR",
+                    "ja_JP",
+                    "nb_NO",
+                    "pl_PL",
+                    "pt_BR",
+                    "pt_PT",
+                    "ru_RU",
+                    "sk_SK",
+                    "tr_TR",
+                    "uk_UA"
+                ],
                 "default": "en_US"
             },
             {

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="7.4"
 
 # dependencies used by the app
 if [ "$(lsb_release --codename --short)" = "bullseye" ]; then