From 226997484022de5dace14fc15e4398ffe68b1876 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 25 May 2022 17:00:11 +0200
Subject: [PATCH] Update to 2022-05-25 17:00
---
roles/glpi/defaults/main.yml | 128 ++++++++++++++++++-----------------
roles/glpi/tasks/install.yml | 8 +--
2 files changed, 70 insertions(+), 66 deletions(-)
diff --git a/roles/glpi/defaults/main.yml b/roles/glpi/defaults/main.yml
index 7a2b954..c24b443 100644
--- a/roles/glpi/defaults/main.yml
+++ b/roles/glpi/defaults/main.yml
@@ -2,14 +2,14 @@
glpi_id: 1
glpi_manage_upgrade: True
-glpi_version: 9.5.7
-glpi_zip_url: https://github.com/glpi-project/glpi/releases/download/{{ glpi_version }}/glpi-{{ glpi_version }}.tgz
-glpi_zip_sha1: 42491c9e0cb1a92ef9361c4ea4207560af86210c
+glpi_version: '10.0.0'
+glpi_archive_url: https://github.com/glpi-project/glpi/releases/download/{{ glpi_version }}/glpi-{{ glpi_version }}.tgz
+glpi_archive_sha256: ba45c23e00b001a335408414e7478087d79a766dc0210f1d8e11651e9e17e11b
glpi_root_dir: /opt/glpi_{{ glpi_id }}
glpi_php_user: php-glpi_{{ glpi_id }}
# If set, will use the following custom PHP FPM pool, which must be created
# glpi_php_fpm_pool: php70
-glpi_php_version: 74
+glpi_php_version: 80
glpi_mysql_server: "{{ mysql_server | default('localhost') }}"
glpi_mysql_db: glpi_{{ glpi_id }}
glpi_mysql_user: glpi_{{ glpi_id }}
@@ -22,67 +22,71 @@ glpi_mysql_user: glpi_{{ glpi_id }}
# - 10.2.0.0/24
glpi_plugins:
- fusioninventory:
- version: '9.5+3.0'
- sha1: ecfd38bb31600d6806cb32a8a5af2db24bac8145
- url: https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi9.5%2B3.0/fusioninventory-9.5+3.0.tar.bz2
- reports:
- version: 1.14.1
- sha1: e2dd2c16982176b5185a08b840e0d524f3f15958
- url: https://github.com/yllen/reports/releases/download/v1.14.1/glpi-plugin-reports-1.14.1.tar.gz
- pdf:
- version: 2.0.0
- sha1: c1eee0ab488852265c6a920510894551424b3f3e
- url: https://forge.glpi-project.org/attachments/download/2335/glpi-pdf-2.0.0.tar.gz
- behaviors:
- version: 2.5.0
- sha1: 972e06027835d9da1e2eb2523caff40382389f81
- url: https://forge.glpi-project.org/attachments/download/2336/glpi-behaviors-2.5.0.tar.gz
+# fusioninventory:
+# version: '9.5+3.0'
+# sha1: ecfd38bb31600d6806cb32a8a5af2db24bac8145
+# url: https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi9.5%2B3.0/fusioninventory-9.5+3.0.tar.bz2
+# reports:
+# version: 1.14.1
+# sha1: e2dd2c16982176b5185a08b840e0d524f3f15958
+# url: https://github.com/yllen/reports/releases/download/v1.14.1/glpi-plugin-reports-1.14.1.tar.gz
+# pdf:
+# version: 2.0.0
+# sha1: c1eee0ab488852265c6a920510894551424b3f3e
+# url: https://forge.glpi-project.org/attachments/download/2335/glpi-pdf-2.0.0.tar.gz
+# behaviors:
+# version: 2.5.0
+# sha1: 972e06027835d9da1e2eb2523caff40382389f81
+# url: https://forge.glpi-project.org/attachments/download/2336/glpi-behaviors-2.5.0.tar.gz
manufacturersimports:
- version: 2.3.2
- sha1: d6e4700f101777379cb10a0868e89ddc42069ec0
- url: https://github.com/InfotelGLPI/manufacturersimports/releases/download/2.3.2/glpi-manufacturersimports-2.3.2.tar.gz
- domains:
- version: 2.2.1
- sha1: 298b459f5a132a20b3e3427921485c201f68ea78
- url: https://github.com/InfotelGLPI/domains/releases/download/2.2.1/glpi-domains-2.2.1.tar.gz
- formcreator:
- version: 2.12.4
- sha1: a4a51edcb46401b78e8006a108caadab0e84cd13
- url: https://github.com/pluginsGLPI/formcreator/releases/download/v2.12.4/glpi-formcreator-2.12.4.tar.bz2
- tag:
- version: 2.8.1
- sha1: 9e88086bd54f41c67ddbd915020be0d558d05668
- url: https://github.com/pluginsGLPI/tag/releases/download/2.8.1/glpi-tag-2.8.1.tar.bz2
- mreporting:
- version: 1.7.3
- sha1: 74956179f3528f5eea9e81381935063e9aaf8ba4
- url: https://github.com/pluginsGLPI/mreporting/releases/download/1.7.3/glpi-mreporting-1.7.3.tar.bz2
- fields:
- version: 1.12.9
- sha1: d94a05a1e14f3a38d9e5865407e3beef73de3162
- url: https://github.com/pluginsGLPI/fields/releases/download/1.12.9/glpi-fields-1.12.9.tar.bz2
- webapplications:
version: 3.0.0
- sha1: c5fe2ce301e02469b0fe66e302dedcf0a564e1ae
- url: https://github.com/InfotelGLPI/webapplications/releases/download/3.0.0/glpi-webapplications-3.0.0.tar.gz
+ sha256: be16ce226b5b9aaeac8968297581d32522b1957434882873b4c35bbce17738cc
+ url: https://github.com/InfotelGLPI/manufacturersimports/releases/download/3.0.0/glpi-manufacturersimports-3.0.0.tar.bz2
+# domains: # Plus maintenu
+# version: 2.2.1
+# sha1: 298b459f5a132a20b3e3427921485c201f68ea78
+# url: https://github.com/InfotelGLPI/domains/releases/download/2.2.1/glpi-domains-2.2.1.tar.gz
+# formcreator:
+# version: 2.12.4
+# sha1: a4a51edcb46401b78e8006a108caadab0e84cd13
+# url: https://github.com/pluginsGLPI/formcreator/releases/download/v2.12.4/glpi-formcreator-2.12.4.tar.bz2
+ tag: # Compat 10
+ version: 2.9.0
+ sha256: ef42dea543341fc6e7ba8bdb4899a942f7f04d56c0482df2c9c64c3bbde1317e
+ url: https://github.com/pluginsGLPI/tag/releases/download/2.9.0/glpi-tag-2.9.0.tar.bz2
+ mreporting:
+ version: 1.8.0
+ sha256: b551f6caab78b252ec7bb3303bced160002c1f31b7bd328c1158c798e266e404
+ url: https://github.com/pluginsGLPI/mreporting/releases/download/1.8.0/glpi-mreporting-1.8.0.tar.bz2
+ fields:
+ version: 1.15.0
+ sha256: 715de87d3b071758d1ef4a1517984cc765547b607fafa6086b67c1e4233e29a4
+ url: https://github.com/pluginsGLPI/fields/releases/download/1.15.0/glpi-fields-1.15.0.tar.bz2
+ webapplications:
+ version: 4.0.0
+ sha256: 67aeb205576d0426508bec606b762cd934533b80bb7b8458c41615b7a692aabb
+ url: https://github.com/InfotelGLPI/webapplications/releases/download/4.0.0/glpi-webapplications-4.0.0.tar.bz2
genericobject:
- version: 2.11.0
- sha1: 011571cd186e1f28fb0d32314707d7c37f0809fe
- url: https://github.com/pluginsGLPI/genericobject/releases/download/2.11.0/glpi-genericobject-2.11.0.tar.bz2
- mantis:
- version: 4.4.1
- sha1: a2a627ff956774777def0e54cb22e3b27d3d41a6
- url: https://github.com/pluginsGLPI/mantis/releases/download/4.4.1/glpi-mantis-4.4.1.tar.bz2
- archimap:
- version: 3.1.4
- sha1: 7e8fb44940a9af0c56a5d604c4ade8ffc11815ff
- url: https://github.com/ericferon/glpi-archimap/releases/download/v3.1.4/archimap-v3.1.4.tar.gz
- dashboard:
- version: 1.0.2
- sha1: c98a504f18c9914b57deda0340c19dbfad08440f
- url: https://forge.glpi-project.org/attachments/download/2323/glpi-dashboard-1.0.2.zip
- rename_from: glpi-dashboard-1.0.2
+ version: 2.12.0
+ sha256: 0ee6cddc5c5a81cb51e1556e5e38c6721514d3710344fdd39d94a9089d64cb80
+ url: https://github.com/pluginsGLPI/genericobject/releases/download/2.12.0/glpi-genericobject-2.12.0.tar.bz2
+ mydashboard:
+ version: 2.0.2
+ sha256: 72b721c477b61ca2decc0caac1ee685d7743e620ae0a846dbdbf0793d2e4ba18
+ url: https://github.com/InfotelGLPI/mydashboard/releases/download/2.0.2/glpi-mydashboard-2.0.2.tar.bz2
+# mantis: # Plus maintenu
+# version: 4.4.1
+# sha1: a2a627ff956774777def0e54cb22e3b27d3d41a6
+# url: https://github.com/pluginsGLPI/mantis/releases/download/4.4.1/glpi-mantis-4.4.1.tar.bz2
+# archimap:
+# version: 3.1.4
+# sha1: 7e8fb44940a9af0c56a5d604c4ade8ffc11815ff
+# url: https://github.com/ericferon/glpi-archimap/releases/download/v3.1.4/archimap-v3.1.4.tar.gz
+# dashboard:
+# version: 1.0.2
+# sha1: c98a504f18c9914b57deda0340c19dbfad08440f
+# url: https://forge.glpi-project.org/attachments/download/2323/glpi-dashboard-1.0.2.zip
+# rename_from: glpi-dashboard-1.0.2
glpi_plugins_to_install: []
diff --git a/roles/glpi/tasks/install.yml b/roles/glpi/tasks/install.yml
index 69f6457..c89e893 100644
--- a/roles/glpi/tasks/install.yml
+++ b/roles/glpi/tasks/install.yml
@@ -12,9 +12,9 @@
- name: Download glpi
get_url:
- url: "{{ glpi_zip_url }}"
+ url: "{{ glpi_archive_url }}"
dest: "{{ glpi_root_dir }}/tmp/"
- checksum: "sha1:{{ glpi_zip_sha1 }}"
+ checksum: "sha256:{{ glpi_archive_sha256 }}"
when: glpi_install_mode != "none"
tags: glpi
@@ -42,7 +42,7 @@
- name: Remove automatic GLPI signature
lineinfile:
- path: "{{ glpi_root_dir }}/web/inc/notificationtemplate.class.php"
+ path: "{{ glpi_root_dir }}/web/src/NotificationTemplate.php"
regexp: '^(.*)Automatically generated by GLPI(.*)$'
line: '\1\2'
backrefs: True
@@ -66,7 +66,7 @@
get_url:
url: "{{ glpi_plugins[item].url }}"
dest: "{{ glpi_root_dir }}/tmp/"
- checksum: "sha1:{{ glpi_plugins[item].sha1 }}"
+ checksum: "sha256:{{ glpi_plugins[item].sha256 }}"
when:
- item not in glpi_installed_plugins.stdout_lines
- glpi_plugins[item] is defined