Merge pull request #13 from YunoHost-Apps/testing

Testing
2024-09-03 20:36:21 +02:00 · 2023-01-27 21:59:06 +01:00 · 2023-01-27 21:59:06 +01:00 · ab3522bccf
commit ab3522bccf
parent 63ac9c170c b59bc3df07
10 changed files with 68 additions and 28 deletions
--- a/README.md
+++ b/README.md
@ -15,9 +15,22 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in

 ## Overview

-IT Asset Management.
+GLPI stands for Gestionnaire Libre de Parc Informatique is a Free Asset and IT Management Software package, that provides ITIL Service Desk features, licenses tracking and software auditing.

-**Shipped version:** 10.0.5~ynh1
+### Features:
+
+- Inventory of computers, peripherals, network printers and any associated components through an interface, with inventory tools such as: FusionInventory or OCS Inventory
+- Data Center Infrastructure Management (DCIM)
+- Item lifecycle management
+- Licenses management (ITIL compliant)
+- Management of warranty and financial information (purchase order, warranty and extension, damping)
+- Management of contracts, contacts, documents related to inventory items
+- Incidents, requests, problems and changes management
+- Knowledge base and Frequently-Asked Questions (FAQ)
+- Asset reservation
+
+
+**Shipped version:** 10.0.6~ynh1

 ## Screenshots

--- a/README_fr.md
+++ b/README_fr.md
@ -5,29 +5,42 @@ It shall NOT be edited by hand.

 # GLPI pour YunoHost

-[![Niveau d'intégration](https://dash.yunohost.org/integration/glpi.svg)](https://dash.yunohost.org/appci/app/glpi) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/glpi.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/glpi.maintain.svg)  
+[![Niveau d’intégration](https://dash.yunohost.org/integration/glpi.svg)](https://dash.yunohost.org/appci/app/glpi) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/glpi.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/glpi.maintain.svg)
 [![Installer GLPI avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glpi)

 *[Read this readme in english.](./README.md)*

-> *Ce package vous permet d'installer GLPI 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 GLPI 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

-Gestion des services informatiques (ITSM).
+GLPI stands for Gestionnaire Libre de Parc Informatique is a Free Asset and IT Management Software package, that provides ITIL Service Desk features, licenses tracking and software auditing.

-**Version incluse :** 10.0.5~ynh1
+### Features:

-## Captures d'écran
+- Inventory of computers, peripherals, network printers and any associated components through an interface, with inventory tools such as: FusionInventory or OCS Inventory
+- Data Center Infrastructure Management (DCIM)
+- Item lifecycle management
+- Licenses management (ITIL compliant)
+- Management of warranty and financial information (purchase order, warranty and extension, damping)
+- Management of contracts, contacts, documents related to inventory items
+- Incidents, requests, problems and changes management
+- Knowledge base and Frequently-Asked Questions (FAQ)
+- Asset reservation

-![Capture d'écran de GLPI](./doc/screenshots/screenshot.png)
+
+**Version incluse :** 10.0.6~ynh1
+
+## Captures d’écran
+
+![Capture d’écran de GLPI](./doc/screenshots/screenshot.png)

 ## Documentations et ressources

-* Site officiel de l'app : <https://glpi-project.org>
-* Documentation officielle de l'admin : <https://glpi-install.readthedocs.io/en/latest/>
-* Dépôt de code officiel de l'app : <https://github.com/glpi-project/glpi>
+* Site officiel de l’app : <https://glpi-project.org>
+* Documentation officielle de l’admin : <https://glpi-install.readthedocs.io/en/latest/>
+* Dépôt de code officiel de l’app : <https://github.com/glpi-project/glpi>
 * Documentation YunoHost pour cette app : <https://yunohost.org/app_glpi>
 * Signaler un bug : <https://github.com/YunoHost-Apps/glpi_ynh/issues>

@ -43,4 +56,4 @@ ou
 sudo yunohost app upgrade glpi -u https://github.com/YunoHost-Apps/glpi_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/4
+++ b/4
@ -11,8 +11,8 @@
 		setup_private=0
 		setup_public=1
 		upgrade=1
-		# 9.5.7~ynh1
-		upgrade=1	from_commit=1c0908e4532ab30071d5162c117ffbaa94a07324
+		# 10.0.5~ynh1
+		upgrade=1	from_commit=5c35f34d4de82b482ca410807fa1b4673bee7df4
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/glpi-project/glpi/releases/download/10.0.5/glpi-10.0.5.tgz
-SOURCE_SUM=a046d0d5bcc08b0024f26bf6e9432e2cb20fa0c83ff128e6cdf8bf83a7405f35
+SOURCE_URL=https://github.com/glpi-project/glpi/releases/download/10.0.6/glpi-10.0.6.tgz
+SOURCE_SUM=d30d915a7cdc2f0e117a38e86b528f787a41e5ffdf9c3a5f9f4a1b8a70bf91ce
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/cron
+++ b/conf/cron
@ -1 +1 @@
-*/1 * * * * root /usr/bin/php__PHPVERSION__ __FINALPATH__/front/cron.php &>/dev/null
+*/1 * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/front/cron.php &>/dev/null
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@ -0,0 +1,13 @@
+GLPI stands for Gestionnaire Libre de Parc Informatique is a Free Asset and IT Management Software package, that provides ITIL Service Desk features, licenses tracking and software auditing.
+
+### Features:
+
+- Inventory of computers, peripherals, network printers and any associated components through an interface, with inventory tools such as: FusionInventory or OCS Inventory
+- Data Center Infrastructure Management (DCIM)
+- Item lifecycle management
+- Licenses management (ITIL compliant)
+- Management of warranty and financial information (purchase order, warranty and extension, damping)
+- Management of contracts, contacts, documents related to inventory items
+- Incidents, requests, problems and changes management
+- Knowledge base and Frequently-Asked Questions (FAQ)
+- Asset reservation
--- a/manifest.json
+++ b/manifest.json
@ -3,10 +3,10 @@
    "id": "glpi",
    "packaging_format": 1,
    "description": {
-        "en": "IT Asset Management.",
-        "fr": "Gestion des services informatiques (ITSM)."
+        "en": "IT Asset Management",
+        "fr": "Gestion des services informatiques (ITSM)"
    },
-    "version": "10.0.5~ynh1",
+    "version": "10.0.6~ynh1",
    "url": "https://glpi-project.org/",
    "upstream": {
        "license": "GPL-2.0",
@ -21,12 +21,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,7 +4,9 @@
 # COMMON VARIABLES
 #=================================================

-php_dependencies="php$YNH_DEFAULT_PHP_VERSION-curl php$YNH_DEFAULT_PHP_VERSION-fileinfo php$YNH_DEFAULT_PHP_VERSION-gd php$YNH_DEFAULT_PHP_VERSION-json php$YNH_DEFAULT_PHP_VERSION-mbstring php$YNH_DEFAULT_PHP_VERSION-mysqli php$YNH_DEFAULT_PHP_VERSION-simplexml php$YNH_DEFAULT_PHP_VERSION-xml php$YNH_DEFAULT_PHP_VERSION-intl php$YNH_DEFAULT_PHP_VERSION-cli php$YNH_DEFAULT_PHP_VERSION-ldap php$YNH_DEFAULT_PHP_VERSION-xmlrpc"
+YNH_PHP_VERSION=8.0
+
+php_dependencies="php$YNH_PHP_VERSION-fpm php$YNH_PHP_VERSION-cli php$YNH_PHP_VERSION-curl php$YNH_PHP_VERSION-fileinfo php$YNH_PHP_VERSION-gd php$YNH_PHP_VERSION-mbstring php$YNH_PHP_VERSION-mysqli php$YNH_PHP_VERSION-simplexml php$YNH_PHP_VERSION-xml php$YNH_PHP_VERSION-intl php$YNH_PHP_VERSION-cli php$YNH_PHP_VERSION-ldap php$YNH_PHP_VERSION-xmlrpc php$YNH_PHP_VERSION-bz2 php$YNH_PHP_VERSION-zip"

 # dependencies used by the app (must be on a single line)
 pkg_dependencies="$php_dependencies"
--- a/scripts/install
+++ b/scripts/install
@ -74,7 +74,6 @@ db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)

 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -20,11 +20,11 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+phpversion=$YNH_PHP_VERSION

 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..." --weight=1

 upgrade_type=$(ynh_check_app_version_changed)