inst-depl

inst-depl : maj versions ...
2023-12-21 21:43:43 +01:00 · 2023-12-21 20:49:29 +01:00 · 2023-12-21 19:26:20 +01:00 · 2023-12-21 19:11:54 +01:00 · 2023-12-21 15:28:53 +01:00 · 2023-12-21 15:14:59 +01:00
29 changed files with 53 additions and 78 deletions
--- a/README.md
+++ b/README.md
@ -42,7 +42,7 @@ Prérequis :
 ## Installation

 On utilisera les images de machines virtuelle suivantes : 
-  * **debian-bookworm-gsb-2023c.ova** (2024-12-18)
+  * **debian-bookworm-gsb-2023c.ova** (2023-12-18)
    * Debian Bookworm 12.4 - 2 cartes - 1 Go - Stockage 20 Go

 et pour **s-fog** : 
@ -81,7 +81,7 @@ bash chname <nouveau_nom_de_machine>` , puis redémarrer
    bash inst-depl
    cd /var/www/html/gsbstore
    bash getall
-    cd /root/tools/ansible/gsb023/pre
+    cd /root/tools/ansible/gsb024/pre
    bash gsbboot
    cd .. ; bash pull-config
 ```
@ -96,7 +96,7 @@ bash chname <nouveau_nom_de_machine>` , puis redémarrer
  - ou sinon:
 ```shell
 mkdir -p tools/ansible ; cd tools/ansible
-git clone https://gitea.lyc-lecastel.fr/gadmin/gsb2023.git
+git clone https://gitea.lyc-lecastel.fr/gsb/gsb2024.git
 cd gsb2024/pre
 export DEPL=192.168.99.99
 bash gsbboot
--- a/pre/inst-depl
+++ b/pre/inst-depl
@ -11,50 +11,36 @@ apt-get update
 apt-get install -y apache2 git 
 STOREREP="/var/www/html/gsbstore" 

-GLPIREL=10.0.6
+GLPIREL=10.0.11
 str="wget -nc https://github.com/glpi-project/glpi/releases/download/${GLPIREL}/glpi-${GLPIREL}.tgz"

-
-#Fusion Inventory
-
-#FIREL=10.0.3+1.0
-#str2="https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FIREL}/fusioninventory-${FIREL}.tar.bz2"
-
-
 #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.9
+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"
+str5="wget -nc https://fr.wordpress.org/latest-fr_FR.tar.gz -O wordpress-6.4.2-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
+ELKREL=8.11.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"


@ -64,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}
--- a/r-ext.yml
+++ b/r-ext.yml
@ -8,5 +8,5 @@
   - r-ext
   - snmp-agent
   - ssh-cli
-   - syslog-cli
+   # - syslog-cli
   - post
--- a/r-int.yml
+++ b/r-int.yml
@ -7,7 +7,7 @@
   - goss
   - r-int
   - ssh-cli
-   - syslog-cli
+   # - syslog-cli
   - dhcp
   - snmp-agent
   - post
--- a/r-vp1.yml
+++ b/r-vp1.yml
@ -15,5 +15,5 @@
   - post
   - wireguard-r
   - ssh-cli
-   - syslog-cli
+   # - syslog-cli
   
--- a/r-vp2.yml
+++ b/r-vp2.yml
@ -18,4 +18,4 @@
   - wireguard-l
   - post
   - ssh-cli
-   - syslog-cli
+   # - syslog-cli
--- a/roles/base/files/sources.list
+++ b/roles/base/files/sources.list
@ -1,10 +1,4 @@
-# 
-
-deb http://ftp.fr.debian.org/debian/ wheezy main contrib non-free
-
-deb http://security.debian.org/ wheezy/updates main
-
-deb http://ftp.fr.debian.org/debian/ wheezy-updates main
-
-deb http://http.debian.net/debian wheezy-backports main
+deb https://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware
+deb https://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware

--- a/roles/base/files/sources.list.Debian
+++ b/roles/base/files/sources.list.Debian
@ -1,4 +1,4 @@
-deb http://deb.debian.org/debian/ bullseye main non-free contrib
-deb http://security.debian.org/debian-security bullseye-security main contrib non-free
-deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
+deb https://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware
+deb https://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware

--- a/roles/base/files/sources.list.bookworm
+++ b/roles/base/files/sources.list.bookworm
@ -0,0 +1,4 @@
+deb https://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware
+deb https://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
+
--- a/roles/base/files/sources.list.bullseye
+++ b/roles/base/files/sources.list.bullseye
@ -0,0 +1,4 @@
+deb http://deb.debian.org/debian/ bullseye main non-free contrib
+deb http://security.debian.org/debian-security bullseye-security main contrib non-free
+deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
+
--- a/s-adm.yml
+++ b/s-adm.yml
@ -9,6 +9,6 @@
    - squid
 #    - local-store
    - snmp-agent
-    - syslog-cli
+    ## - syslog-cli
    - post
 #    - goss
--- a/s-agence.yml
+++ b/s-agence.yml
@ -5,6 +5,6 @@
  roles:
    - base
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
    - goss
--- a/s-appli.yml
+++ b/s-appli.yml
@ -7,7 +7,7 @@
    - goss
    - appli
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - snmp-agent
    - ssl-apache
    - post
--- a/s-backup.yml
+++ b/s-backup.yml
@ -8,7 +8,7 @@
 #   - proxy3
    - snmp-agent
 #   - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - smb-backup
    - dns-slave
    - post
--- a/s-docker.yml
+++ b/s-docker.yml
@ -7,7 +7,7 @@
    - goss
    - snmp-agent
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - docker-openvas-ab
      #- docker-iredmail-ab
    - post
--- a/s-elk.yml
+++ b/s-elk.yml
@ -7,5 +7,5 @@
    - docker
    - elk
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
--- a/s-fog.yml
+++ b/s-fog.yml
@ -8,6 +8,6 @@
    - dhcp-fog
    - ssh-cli
    - snmp-agent
-    - syslog-cli
+    # - syslog-cli
    - fog
    - post
--- a/s-gestsup.yml
+++ b/s-gestsup.yml
@ -7,6 +7,6 @@
    - gestsup
    - postfix-gestsup
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - snmp-agent
    - post
--- a/s-infra.yml
+++ b/s-infra.yml
@ -8,7 +8,7 @@
    - dns-master
    - webautoconf
    - snmp-agent
-    - syslog-cli
+    # - syslog-cli
    - ssh-cli
    - post

--- a/s-itil.yml
+++ b/s-itil.yml
@ -16,5 +16,5 @@
    - snmp-agent
    - glpi
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
--- a/s-mess.yml
+++ b/s-mess.yml
@ -6,6 +6,6 @@
    - base
    - docker-nextcloud
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - snmp-agent
    - post
--- a/s-nas.yml
+++ b/s-nas.yml
@ -12,5 +12,5 @@
    - snmp-agent
    - lb-nfs-server
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
--- a/s-nxc.yml
+++ b/s-nxc.yml
@ -7,6 +7,6 @@
    - docker
    - nxc-traefik
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - snmp-agent
    - post
--- a/s-proxy.yml
+++ b/s-proxy.yml
@ -8,5 +8,5 @@
    - squid
    - snmp-agent
    - ssh-cli
-    - syslog-cli
+    # - syslog-cli
    - post
--- a/s-test.yml
+++ b/s-test.yml
@ -6,7 +6,7 @@
    - base
    - goss
    - snmp-agent
-    - syslog-cli
+    # - syslog-cli
    - ssh-cli
    - post

--- a/scripts/debian11/chname
+++ b/scripts/debian11/chname
--- a/scripts/debian11/gsb-start
+++ b/scripts/debian11/gsb-start
@ -3,8 +3,8 @@ apt-get  update
 #upgrade -y
 mkdir -p /root/tools/ansible
 cd /root/tools/ansible
-git clone https://gitea.lyc-lecastel.fr/gadmin/gsb2023.git
-cd gsb2023/pre
+git clone https://gitea.lyc-lecastel.fr/gsb/gsb2024.git
+cd gsb2024/pre
 export DEPL=192.168.99.99
 bash gsbboot
 cd ../..
--- a/scripts/mkvm
+++ b/scripts/mkvm
@ -1,10 +1,11 @@
 #!/bin/bash

-mkvmrelease="v1.2.2"
+mkvmrelease="v1.2.3"

-ovarelease="2023b"
+ovarelease="2023c"
 ovafogrelease="2023b"
-ovafile="$HOME/Téléchargements/debian-bullseye-gsb-${ovarelease}.ova"
+#ovafile="$HOME/Téléchargements/debian-bullseye-gsb-${ovarelease}.ova"
+ovafile="$HOME/Téléchargements/debian-bookworm-gsb-${ovarelease}.ova"
 ovafilefog="$HOME/Téléchargements/debian-buster-gsb-${ovafogrelease}.ova"
 deletemode=0

--- a/scripts/debian11/s-adm-start
+++ b/scripts/debian11/s-adm-start
Author	SHA1	Message	Date
Auguste Bedloe	78da7eef67	inst-depl	2023-12-21 21:43:43 +01:00
Auguste Bedloe	ed512fc702	inst-depl	2023-12-21 20:49:29 +01:00
Auguste Bedloe	17266a2b57	inst-depl : maj versions ...	2023-12-21 19:26:20 +01:00
Auguste Bedloe	26ebf4899b	Maj doc pour 2024	2023-12-21 19:11:54 +01:00
Alhassane Kone	21d6a77ffa	commente syslog-cli pour r-*	2023-12-21 15:28:53 +01:00
sio user	23b480e9fd	comment syslog-cli	2023-12-21 15:14:59 +01:00
sio user	9f99511968	gsb-start...	2023-12-21 15:06:38 +01:00
sio user	cceccda12b	comment syslog-cli	2023-12-21 14:46:12 +01:00
sio user	36a6850a52	MAJ pour bookworm	2023-12-21 14:37:43 +01:00
sio user	d14bf44b2b	Modif Nom VM dans mkvm	2023-12-21 14:23:29 +01:00
sio user	a4fd46609d	scripts de debian11 vers niv. sup.	2023-12-19 14:01:12 +01:00