From ed512fc702b0bfeb732ef20f0df4cdc204a90c87 Mon Sep 17 00:00:00 2001
From: Auguste Bedloe <a.bedloe@example;com>
Date: Thu, 21 Dec 2023 20:49:29 +0100
Subject: [PATCH] inst-depl

---
 pre/inst-depl | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/pre/inst-depl b/pre/inst-depl
index b03f574..a58552c 100644
--- a/pre/inst-depl
+++ b/pre/inst-depl
@@ -11,43 +11,36 @@ apt-get update
 apt-get install -y apache2 git 
 STOREREP="/var/www/html/gsbstore" 
 
-GLPIREL=10.0.10
+GLPIREL=10.0.11
 str="wget -nc https://github.com/glpi-project/glpi/releases/download/${GLPIREL}/glpi-${GLPIREL}.tgz"
 
 #GLPI Agent
 
-GLPIAGVER=1.4
+GLPIAGVER=1.7
 str31="wget -nc https://github.com/glpi-project/glpi-agent/releases/download/${GLPIAGVER}/GLPI-Agent-${GLPIAGVER}-x64.msi"
 
-str32="wget -nc https://github.com/glpi-project/glpi-agent/releases/download/${GLPIAGVER}/GLPI-Agent-${GLPIAGVER}-x86.msi"
-
+#str32="wget -nc https://github.com/glpi-project/glpi-agent/releases/download/${GLPIAGVER}/GLPI-Agent-${GLPIAGVER}-x86.msi"
 
 FOGREL=1.5.10
 str4="wget -nc https://github.com/FOGProject/fogproject/archive/${FOGREL}.tar.gz -O fogproject-${FOGREL}.tar.gz"
 
-WPREL=6.1.1
+WPREL=6.4.2
 #v6.1.1 le 17/01/2023
 str5="wget -nc https://fr.wordpress.org/latest-fr_FR.tar.gz -O wordpress-6.1.1-fr_FR.tar.gz"
 
-GOSSVER=v0.3.21
-str6="curl -L https://github.com/aelsabbahy/goss/releases/download/${GOSSVER}/goss-linux-amd64 -o goss"
+str6="curl -L https://github.com/goss-org/goss/releases/latest/download/goss-linux-amd64 -o goss"
 
-#DOCKERREL=1.29.2
-#str7="curl -L https://github.com/docker/compose/releases/download/${DOCKERREL}/docker-compose-$(uname -s)-$(uname -m) -o docker-compose"
+str7="curl -L https://github.com/goss-org/goss/releases/latest/download/dgoss -o dgoss"
 
 #GESTSUPREL=3.2.30
 #str8="wget -nc 'https://gestsup.fr/index.php?page=download&channel=stable&version=${GESTSUPREL}&type=gestsup' -O gestsup_${GESTSUPREL}.zip"
 str8="wget -nc 'https://gestsup.fr/index.php?page=download&channel=stable&version=3.2.30&type=gestsup' -O gestsup_3.2.30.zip"
 
-
 #METRICBEAT ET FILEBEAT
 ELKREL=8.5.3
 str81="wget https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${ELKREL}-amd64.deb"
-
 str82="wget https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${ELKREL}-windows-x86_64.zip"
-
 str83="wget https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-${ELKREL}-windows-x86_64.zip"
-
 str84="wget https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-${ELKREL}-amd64.deb"
 
 
@@ -57,32 +50,18 @@ str84="wget https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-$
 #!/bin/bash
 
 ${str}
-
-${str2}
-
 ${str31}
-
-${str32}
-
 ${str4}
-
 ${str5}
-
 ${str6}
+${str7}
 
-chmod +x ./goss
+chmod +x ./goss ./dgoss
 
 curl -L https://get.docker.com -o getdocker.sh
-
 chmod +x ./getdocker.sh
 
-#${str7}
-
-#chmod +x ./docker-compose
-
-
 wget -nc https://github.com/FiloSottile/mkcert/releases/download/v1.4.4/mkcert-v1.4.4-linux-amd64 -O mkcert
-
 chmod +x ./mkcert
 
 ${str8}