Modif du script d'installation de docker

Merge branch 'main' of https://gitea.lyc-lecastel.fr/gadmin/gsb2023

goss/r-ext.yaml

@@ -34,8 +34,6 @@ interface:
     - 192.168.100.254/24
   enp0s9:
     exists: true
-    addrs:
-    - 192.168.0.38/24
   enp0s16:
     exists: true
     addrs:

goss/s-adm.yaml

@@ -16,10 +16,6 @@ port:
     listening: true
     ip:
     - '::'
-  tcp6:8080:
-    listening: true
-    ip:
-    - '::'
   udp:53:
     listening: true
     ip:
@@ -45,7 +41,6 @@ service:
 user:
   dnsmasq:
     exists: true
-    uid: 109
     gid: 65534
     groups:
     - nogroup
@@ -54,7 +49,6 @@ user:
 group:
   ssh:
     exists: true
-    gid: 111
 command:
   /sbin/sysctl net.ipv4.ip_forward:
     exit-status: 0
@@ -65,8 +59,6 @@ command:
 dns:
   depl.sio.lan:
     resolveable: true
-    addrs:
-    - 10.121.38.10
     timeout: 500
 process:
   dnsmasq:

roles/docker/tasks/main.yml

@@ -1,16 +1,16 @@
 ---
-- name: Téléchargement getdocker.sh
-  ansible.builtin.get_url:
-    url: http://s-adm.gsb.adm/gsbstore/getdocker.sh
-    dest: /tmp
-    mode: '0755'
+- name: Supprime le fichier getdocker.sh si déjà présent
+  file:
+    state: absent
+    path: /tmp/getdocker.sh
+
+- name: Télécharge le script d'installation de docker
+  uri:
+    url: 'https://get.docker.com'
+    method: GET
+    dest: /tmp/getdocker.sh
+    mode: a+x
+  register: result
 
 - name: Execution du script getdocker
-  ansible.builtin.script: 
-    cmd: /tmp/getdocker.sh
-
-- name: Téléchargement docker-compose
-  ansible.builtin.get_url:
-    url: http://s-adm.gsb.adm/gsbstore/docker-compose
-    dest: /usr/local/bin               
-    mode: '0755'
+  shell: bash /tmp/getdocker.sh

roles/itil/defaults/main.yml

@@ -1,5 +1,6 @@
 depl_url: "http://s-adm.gsb.adm/gsbstore"
-depl_glpi: "glpi-9.5.6.tgz"
+#depl_glpi: "glpi-9.5.6.tgz"
+depl_glpi: "glpi-10.0.5.tgz"
 depl_fusioninventory: "fusioninventory-9.5+3.0.tar.bz2"
 depl_fusioninventory_agentx64: "fusioninventory-agent_windows-x64_2.6.exe"
 depl_fusioninventory_agentx86: "fusioninventory-agent_windows-x86_2.6.exe"

roles/local-store/files/getall-latest

@@ -1,5 +1,6 @@
 #!/bin/bash
-GLPIREL=9.5.3
+#GLPIREL=9.5.3
+GLPIREL=10.0.5
 wget -nc https://github.com/glpi-project/glpi/releases/download/${GLPIREL}/glpi-${GLPIREL}.tgz
  
 FIREL=9.5+1.0

roles/post/files/interfaces.s-mon

@@ -1,7 +1,7 @@
 # This file describes the network interfaces available on your system
 # and how to activate them. For more information, see interfaces(5).
 
-source /etc/network/interfaces.d/*
+#source /etc/network/interfaces.d/*
 
 # The loopback network interface
 auto lo
@@ -10,7 +10,7 @@ iface lo inet loopback
 # cote n-adm
 allow-hotplug enp0s3
 iface enp0s3 inet static
-	address 192.168.99.104/24
+	address 192.168.99.8/24
 	gateway 192.168.99.99	 
 
 # Cote n-infra
@@ -20,4 +20,4 @@ iface enp0s8 inet static
 	up ip route add 172.16.64.0/24 via 172.16.0.254
 	up ip route add 172.16.128.0/24 via 172.16.0.254
 	up ip route add 192.168.0.0/16 via 172.16.0.254
-	up ip route add 192.168.200.0/24 via 172.16.0.254
+	up ip route add 192.168.200.0/24 via 172.16.0.254

roles/post/files/interfaces.s-nas

@@ -1,4 +1,4 @@
-source /etc/network/interfaces.d/*
+#source /etc/network/interfaces.d/*
 
 # The loopback network interface
 auto lo
@@ -14,4 +14,4 @@ iface enp0s3 inet static
 allow-hotplug enp0s8
 iface enp0s8 inet static
         address 192.168.102.253
-	netmask 255.255.255.0
+	netmask 255.255.255.0

roles/wireguard-l/tasks/main.yml

@@ -9,13 +9,13 @@
     name: wireguard-tools
     state: present
 
-- name: installation de sshpass
-  apt:
-    name: sshpass
-    state: present
+#- name: installation de sshpass
+#  apt:
+#    name: sshpass
+#    state: present
 
-- name: copie du fichier de configuration depuis r-vp1
-  command: "sshpass -p 'root' scp -r root@192.168.99.112:/root/confwg/wg0-b.conf /etc/wireguard/"
+#- name: copie du fichier de configuration depuis r-vp1
+#  command: "sshpass -p 'root' scp -r root@192.168.99.112:/root/confwg/wg0-b.conf /etc/wireguard/"
 
 - name: renommage du fichier de configuration
   command: "mv /etc/wireguard/wg0-b.conf /etc/wireguard/wg0.conf"

scripts/mkvm

@@ -1,7 +1,9 @@
 #!/bin/bash
 
 ovarelease="2023a"
+ovafogrelease="2023a"
 ovafile="$HOME/Téléchargements/debian-bullseye-gsb-${ovarelease}.ova"
+ovafilefog="$HOME/Téléchargements/debian-buster-gsb-${ovafogrelease}.ova"
 
 
 usage () {
@@ -12,27 +14,31 @@ usage () {
 }
 
 create_vm () {
-	nom=$1
-	if [[ ! -r "${ovafile}" ]]; then
-		echo "$0 : erreur ouverture fichier ${ovafile} ..."
+	nom="$1"
+	nomova=${ovafile}
+	if [[ "${nom}" == "s-fog" ]] ; then 
+		nomova="${ovafilefog}"
+	fi
+	if [[ ! -r "${nomova}" ]]; then
+		echo "$0 : erreur ouverture fichier ${nomova} ..."
 		exit 3
 	fi
-	vboxmanage import "${ovafile}"  --vsys 0 --vmname "${nom}"
+	vboxmanage import "${nomova}"  --vsys 0 --vmname "${nom}"
 }
 
 setif () {
 
-	VBoxManage modifyvm  $1 --nic${2} intnet
-	VBoxManage modifyvm  $1 --intnet${2} $3
-	VBoxManage modifyvm  $1 --nictype${2} 82540EM
-	VBoxManage modifyvm  $1 --cableconnected${2} on
-	VBoxManage modifyvm  $1 --nicpromisc${2} allow-all
+	VBoxManage modifyvm  "$1" --nic"${2}" intnet
+	VBoxManage modifyvm  "$1" --intnet"${2}" "$3"
+	VBoxManage modifyvm  "$1" --nictype"${2}" 82540EM
+	VBoxManage modifyvm  "$1" --cableconnected"${2}" on
+	VBoxManage modifyvm  "$1" --nicpromisc"${2}" allow-all
 }
 
 create_if () {
 # enp0s3
-	setif $1 1 $2
-	setif $1 2 $3
+	setif "$1" 1 "$2"
+	setif "$1" 2 "$3"
 #(enp0s8)
 }
 
@@ -41,7 +47,7 @@ if [[ $# != 1 ]] ; then
 	usage
 fi
 
-vm=$1
+vm="$1"
 
 create_vm "${vm}"
 if [[ "${vm}" == "s-infra" ]] ; then
@@ -74,6 +80,8 @@ elif [[ "${vm}" == "s-DNS-ext" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz"
 elif [[ "${vm}" == "s-web-ext" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz"
+elif [[ "${vm}" == "s-nxc" ]] ; then
+        create_if "${vm}" "n-adm" "n-infra"
 elif [[ "${vm}" == "s-lb" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz" "n-dmz-lb"
 elif [[ "${vm}" == "s-web1" ]] ; then