From 0d4f93d037b67ac042400ef77919f00990e8e435 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Fri, 30 Dec 2022 13:41:04 +0100 Subject: [PATCH 01/16] Add php bz2 and zip --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index c7cec70..86fd4fe 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # 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" +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 php$YNH_DEFAULT_PHP_VERSION-bz2 php$YNH_DEFAULT_PHP_VERSION-zip" # dependencies used by the app (must be on a single line) pkg_dependencies="$php_dependencies" From 50164053ea022918a460dfb219e17be23b13bb3d Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Fri, 30 Dec 2022 16:59:42 +0100 Subject: [PATCH 02/16] Add php bz2 and zip --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index fb624a0..ed7390c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "IT Asset Management.", "fr": "Gestion des services informatiques (ITSM)." }, - "version": "10.0.5~ynh1", + "version": "10.0.5~ynh2", "url": "https://glpi-project.org/", "upstream": { "license": "GPL-2.0", From 310df4093735922cd6bdf7f8c5251ed6c16b7fd2 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Fri, 30 Dec 2022 17:00:05 +0100 Subject: [PATCH 03/16] Add php bz2 and zip --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3140bd6..029b9f6 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in IT Asset Management. -**Shipped version:** 10.0.5~ynh1 +**Shipped version:** 10.0.5~ynh2 ## Screenshots From fcf2fa1425263eeea2af943f871b3e55cf634676 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Fri, 30 Dec 2022 17:00:26 +0100 Subject: [PATCH 04/16] Add php bz2 and zip --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index e2e4f30..0efcbac 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Gestion des services informatiques (ITSM). -**Version incluse :** 10.0.5~ynh1 +**Version incluse :** 10.0.5~ynh2 ## Captures d'écran From 912f2eda9ec515496d0044917c16260acb6b95da Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 16 Jan 2023 21:41:08 +0000 Subject: [PATCH 05/16] Auto-update README --- README_fr.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README_fr.md b/README_fr.md index e2e4f30..2addf92 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,29 +5,29 @@ 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). **Version incluse :** 10.0.5~ynh1 -## Captures d'écran +## Captures d’écran -![Capture d'écran de GLPI](./doc/screenshots/screenshot.png) +![Capture d’écran de GLPI](./doc/screenshots/screenshot.png) ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -43,4 +43,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 :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 042e6574711689f84ca15325a3a61b60f3aeb6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 16 Jan 2023 22:41:28 +0100 Subject: [PATCH 06/16] Update manifest.json --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index fb624a0..e5bed5d 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "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", "url": "https://glpi-project.org/", @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ From e1c6cd0db78d0460ad61d9e01b557650218b8e09 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 16 Jan 2023 21:41:38 +0000 Subject: [PATCH 07/16] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3140bd6..469ab3d 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -IT Asset Management. +IT Asset Management **Shipped version:** 10.0.5~ynh1 diff --git a/README_fr.md b/README_fr.md index 2addf92..5159771 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Gestion des services informatiques (ITSM). +Gestion des services informatiques (ITSM) **Version incluse :** 10.0.5~ynh1 From 19d3434611ac524878d60de5db4df84852131d9a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 25 Jan 2023 06:13:55 +0000 Subject: [PATCH 08/16] Upgrade to v10.0.6 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 752929a..db9b01a 100644 --- 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 diff --git a/manifest.json b/manifest.json index e5bed5d..705d45b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "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", From 6c34e2e1b82af0460078cfbae5bcb404b1439dd5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 25 Jan 2023 06:14:01 +0000 Subject: [PATCH 09/16] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 469ab3d..b473543 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # GLPI for YunoHost -[![Integration level](https://dash.yunohost.org/integration/glpi.svg)](https://dash.yunohost.org/appci/app/glpi) ![Working status](https://ci-apps.yunohost.org/ci/badges/glpi.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/glpi.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/glpi.svg)](https://dash.yunohost.org/appci/app/glpi) ![Working status](https://ci-apps.yunohost.org/ci/badges/glpi.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/glpi.maintain.svg) [![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)* @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in IT Asset Management -**Shipped version:** 10.0.5~ynh1 +**Shipped version:** 10.0.6~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 5159771..211543e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ 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)* @@ -17,7 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Gestion des services informatiques (ITSM) -**Version incluse :** 10.0.5~ynh1 +**Version incluse :** 10.0.6~ynh1 ## Captures d’écran From 8929aae5514c8ebe04cc45de79b76b3f90e5223b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 25 Jan 2023 15:20:38 +0100 Subject: [PATCH 10/16] PHP8 --- conf/cron | 2 +- scripts/_common.sh | 4 +++- scripts/install | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/cron b/conf/cron index c287873..ae494f9 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -*/1 * * * * root /usr/bin/php__PHPVERSION__ __FINALPATH__/front/cron.php &>/dev/null \ No newline at end of file +*/1 * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/front/cron.php &>/dev/null \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index 86fd4fe..c7ade5c 100644 --- 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 php$YNH_DEFAULT_PHP_VERSION-bz2 php$YNH_DEFAULT_PHP_VERSION-zip" +YNH_PHP_VERSION=8.0 + +php_dependencies="php$YNH_PHP_VERSION-curl php$YNH_PHP_VERSION-fileinfo php$YNH_PHP_VERSION-gd php$YNH_PHP_VERSION-json 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" diff --git a/scripts/install b/scripts/install index 3d009f4..41adeec 100644 --- 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 From 5dfb6156a596919fe7fdc6e592b00ab9dc06314e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 25 Jan 2023 15:21:38 +0100 Subject: [PATCH 11/16] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index c7ade5c..e0d0da3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION=8.0 -php_dependencies="php$YNH_PHP_VERSION-curl php$YNH_PHP_VERSION-fileinfo php$YNH_PHP_VERSION-gd php$YNH_PHP_VERSION-json 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" +php_dependencies="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" From 83ceb513017c2a16ed8faed2ef2f3b4065d23dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 25 Jan 2023 15:22:48 +0100 Subject: [PATCH 12/16] Update DESCRIPTION.md --- doc/DESCRIPTION.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index e69de29..9cead0d 100644 --- 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 From 874cbb98bed75235a816377bda765893411a8917 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 25 Jan 2023 14:22:53 +0000 Subject: [PATCH 13/16] Auto-update README --- README.md | 15 ++++++++++++++- README_fr.md | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b473543..e141a7a 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,20 @@ 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. + +### 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 diff --git a/README_fr.md b/README_fr.md index 211543e..56255b0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,20 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## 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. + +### 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 + **Version incluse :** 10.0.6~ynh1 From fd4b553fb36897b3b1596a68e5fa58e1c7c9d7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 25 Jan 2023 15:24:00 +0100 Subject: [PATCH 14/16] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 705d45b..f5e08b6 100644 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php8.0-fpm", "mysql" ], "arguments": { From 25e3175c77ebcfe58ba44c7f87bb76256af31b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Jan 2023 12:37:39 +0100 Subject: [PATCH 15/16] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 13979de..a957e8e 100644 --- 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) From b59bc3df07749a86be43de8849a3e267069f7d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Jan 2023 12:39:08 +0100 Subject: [PATCH 16/16] Fix --- check_process | 4 ++-- scripts/_common.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 699b013..575295e 100644 --- a/check_process +++ b/check_process @@ -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 diff --git a/scripts/_common.sh b/scripts/_common.sh index e0d0da3..76f09a0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION=8.0 -php_dependencies="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" +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"