Merge pull request #31 from YunoHost-Apps/testing

Testing
2024-09-03 20:36:21 +02:00 · 2024-05-13 23:02:27 +02:00 · 2024-05-13 23:02:27 +02:00 · bf03872632
commit bf03872632
parent 26d1ec5d5d f4975f0b21
10 changed files with 140 additions and 18 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -1,6 +1,7 @@
 # All available README files by language

 - [Read the README in English](README.md)
+- [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ It shall NOT be edited by hand.

 [![Install GLPI with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glpi)

-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*

 > *This package allows you to install GLPI 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.*
@ -31,7 +31,7 @@ GLPI stands for Gestionnaire Libre de Parc Informatique is a Free Asset and IT M
 - Asset reservation


-**Shipped version:** 10.0.12~ynh1
+**Shipped version:** 10.0.15~ynh1

 ## Screenshots

--- a/README_eu.md
+++ b/README_eu.md
@ -0,0 +1,60 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# GLPI YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/glpi.svg)](https://dash.yunohost.org/appci/app/glpi) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/glpi.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/glpi.maintain.svg)
+
+[![Instalatu GLPI YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glpi)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek GLPI YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+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
+
+
+**Paketatutako bertsioa:** 10.0.15~ynh1
+
+## Pantaila-argazkiak
+
+![GLPI(r)en pantaila-argazkia](./doc/screenshots/screenshot.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://glpi-project.org>
+- Administratzaileen dokumentazio ofiziala: <https://glpi-install.readthedocs.io/en/latest/>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/glpi-project/glpi>
+- YunoHost Denda: <https://apps.yunohost.org/app/glpi>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/glpi_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/glpi_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/glpi_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade glpi -u https://github.com/YunoHost-Apps/glpi_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -30,7 +30,7 @@ GLPI signifie Gestionnaire Libre de Parc Informatique. Il s'agit d'un progiciel
 - Base de connaissances et foire aux questions (FAQ)
 - Réservation d'actifs

-**Version incluse :** 10.0.12~ynh1
+**Version incluse :** 10.0.15~ynh1

 ## Captures d’écran

--- a/README_gl.md
+++ b/README_gl.md
@ -31,7 +31,7 @@ GLPI stands for Gestionnaire Libre de Parc Informatique is a Free Asset and IT M
 - Asset reservation


-**Versión proporcionada:** 10.0.12~ynh1
+**Versión proporcionada:** 10.0.15~ynh1

 ## Capturas de pantalla

--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -0,0 +1,60 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 GLPI
+
+[![集成程度](https://dash.yunohost.org/integration/glpi.svg)](https://dash.yunohost.org/appci/app/glpi) ![工作状态](https://ci-apps.yunohost.org/ci/badges/glpi.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/glpi.maintain.svg)
+
+[![使用 YunoHost 安装 GLPI](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glpi)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 GLPI。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+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
+
+
+**分发版本：** 10.0.15~ynh1
+
+## 截图
+
+![GLPI 的截图](./doc/screenshots/screenshot.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://glpi-project.org>
+- 官方管理文档： <https://glpi-install.readthedocs.io/en/latest/>
+- 上游应用代码库： <https://github.com/glpi-project/glpi>
+- YunoHost 商店： <https://apps.yunohost.org/app/glpi>
+- 报告 bug： <https://github.com/YunoHost-Apps/glpi_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/glpi_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/glpi_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade glpi -u https://github.com/YunoHost-Apps/glpi_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>
--- a/doc/POST_INSTALL_fr.md
+++ b/doc/POST_INSTALL_fr.md
@ -0,0 +1,2 @@
+Première connexion login par défaut pour le super-admin : glpi/glpi
+Pour des raisons de sécurité, veuillez modifier le mot de passe des utilisateurs par défaut.
--- a/manifest.toml
+++ b/manifest.toml
@ -5,7 +5,7 @@ name = "GLPI"
 description.en = "IT Asset Management"
 description.fr = "Gestion des services informatiques (ITSM)"

-version = "10.0.12~ynh1"
+version = "10.0.15~ynh1"

 maintainers = []

@ -19,8 +19,11 @@ code = "https://github.com/glpi-project/glpi"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "200M"
 ram.runtime = "50M"
@ -39,8 +42,8 @@ ram.runtime = "50M"

 [resources]
        [resources.sources.main]
-        url = "https://github.com/glpi-project/glpi/releases/download/10.0.12/glpi-10.0.12.tgz"
-        sha256 = "7980cd5f9ab10dc234e1e42950acd42c2977e5c3da4d540ef000e9caa72cec85"
+        url = "https://github.com/glpi-project/glpi/releases/download/10.0.15/glpi-10.0.15.tgz"
+        sha256 = "8ce94c1403c1143a5b503f18f7b7b9a5d29e83489fc81cc7287b719df0b97236"
        autoupdate.strategy = "latest_github_tag"

    [resources.system_user]
@ -51,7 +54,7 @@ ram.runtime = "50M"
    main.url = "/"

    [resources.apt]
-    packages = "mariadb-server, php8.2-cli,php8.2-curl, php8.2-fileinfo, php8.2-gd, php8.2-mbstring, php8.2-mysqli, php8.2-simplexml, php8.2-xml, php8.2-intl, php8.2-ldap, php8.2-xmlrpc, php8.2-bz2, php8.2-zip"
+    packages = "mariadb-server, php8.2-cli, php8.2-curl, php8.2-fileinfo, php8.2-gd, php8.2-mbstring, php8.2-mysqli, php8.2-simplexml, php8.2-xml, php8.2-intl, php8.2-ldap, php8.2-xmlrpc, php8.2-bz2, php8.2-zip"

    [resources.database]
    type = "mysql"
--- a/scripts/install
+++ b/scripts/install
@ -31,7 +31,7 @@ ynh_add_fpm_config
 # Create a dedicated NGINX config
 ynh_add_nginx_config

-ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+ynh_add_config --template="cron" --destination="/etc/cron.d/$app"

 #=================================================
 # SPECIFIC SETUP
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -18,14 +18,10 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1

-if [ "$upgrade_type" == "UPGRADE_APP" ]
-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="$install_dir"
-fi
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir" #--full_replace=1

 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@ -41,7 +37,7 @@ ynh_add_fpm_config
 # Create a dedicated NGINX config
 ynh_add_nginx_config

-ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+ynh_add_config --template="cron" --destination="/etc/cron.d/$app"

 #=================================================
 # SPECIFIC UPGRADE