From d0b4222e157a4883de85f9c713e0e1267d65f232 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 11 Mar 2024 16:05:00 +0100 Subject: [PATCH 1/7] [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c42b300..17f650f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,7 @@ 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" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 fi chmod -R o-rwx "$install_dir" From 6136f2369267ec642913803e6cb45f76f4e11a5a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Apr 2024 03:51:06 +0200 Subject: [PATCH 2/7] Upgrade to v10.0.15 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index b524d6f..f48f86c 100644 --- 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 = [] @@ -39,8 +39,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/archive/refs/tags/10.0.15.tar.gz" + sha256 = "70f88dc8e383c684fca0fbceb5945e8c00c4f7e966dd10ab9a22a6ec60ed8274" autoupdate.strategy = "latest_github_tag" [resources.system_user] From b2e0e829cfc13a1d9de0f021d335daaed2d8ae38 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Apr 2024 01:51:08 +0000 Subject: [PATCH 3/7] Auto-update READMEs --- ALL_README.md | 7 ++++++ README.md | 26 ++++++++++---------- README_eu.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 30 ++++++++++++------------ README_gl.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 215 insertions(+), 28 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..a01b345 --- /dev/null +++ b/ALL_README.md @@ -0,0 +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) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index c8ff539..f1e0e8d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ 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) -*[Lire ce readme en français.](./README_fr.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.* +> *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.* ## Overview @@ -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 @@ -39,19 +39,19 @@ GLPI stands for Gestionnaire Libre de Parc Informatique is a Free Asset and IT M ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/glpi_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/glpi_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/glpi_ynh/tree/testing --debug or sudo yunohost app upgrade glpi -u https://github.com/YunoHost-Apps/glpi_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..98e2504 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,60 @@ + + +# 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: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## 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:** diff --git a/README_fr.md b/README_fr.md index b9ea1bb..21cb687 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # GLPI pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![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)* +*[Lire le README dans d'autres langues.](./ALL_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, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -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 @@ -38,22 +38,22 @@ GLPI signifie Gestionnaire Libre de Parc Informatique. Il s'agit d'un progiciel ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/glpi_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/glpi_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/glpi_ynh/tree/testing --debug 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 :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..816febb --- /dev/null +++ b/README_gl.md @@ -0,0 +1,60 @@ + + +# GLPI para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/glpi.svg)](https://dash.yunohost.org/appci/app/glpi) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/glpi.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/glpi.maintain.svg) + +[![Instalar GLPI con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glpi) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar GLPI de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +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 + + +**Versión proporcionada:** 10.0.15~ynh1 + +## Capturas de pantalla + +![Captura de pantalla de GLPI](./doc/screenshots/screenshot.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/glpi_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/glpi_ynh/tree/testing --debug +ou +sudo yunohost app upgrade glpi -u https://github.com/YunoHost-Apps/glpi_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..f5affdc --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,60 @@ + + +# 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) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`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 +``` + +**有关应用打包的更多信息：** From 7b76feaa202af5354da416145b23207ce17cd598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 25 Apr 2024 09:19:46 +0200 Subject: [PATCH 4/7] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index f48f86c..5787eee 100644 --- a/manifest.toml +++ b/manifest.toml @@ -39,8 +39,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/glpi-project/glpi/archive/refs/tags/10.0.15.tar.gz" - sha256 = "70f88dc8e383c684fca0fbceb5945e8c00c4f7e966dd10ab9a22a6ec60ed8274" + 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 +51,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" From 72553e168890bdb7b4343d9bb02a971cbd8f6549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 May 2024 07:13:54 +0200 Subject: [PATCH 5/7] cleaning --- manifest.toml | 3 +++ scripts/install | 2 +- scripts/upgrade | 12 ++++-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5787eee..fb4994b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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" diff --git a/scripts/install b/scripts/install index 22e91da..58fbb56 100644 --- 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 diff --git a/scripts/upgrade b/scripts/upgrade index 17f650f..1c87f75 100644 --- 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" --full_replace=1 -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 From 835c38eb13c971013d54bcbb4185b038202a845e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 7 May 2024 05:13:58 +0000 Subject: [PATCH 6/7] Auto-update READMEs --- README_zh_Hans.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index f5affdc..bb261b5 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 GLPI +# 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) From a963d76ae36b23a167f444d00dd5c795a65e24d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 May 2024 07:15:14 +0200 Subject: [PATCH 7/7] Create POST_INSTALL_fr.md --- doc/POST_INSTALL_fr.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/POST_INSTALL_fr.md diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md new file mode 100644 index 0000000..8338b19 --- /dev/null +++ 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. \ No newline at end of file