modif sur s-adm.yml

pre/gsbboot

@@ -34,7 +34,7 @@ if [[ $? != 0 ]]; then
 	${APT} install -y git-core
 fi
 ${APT} update
-${APT} upgrade -y
+#${APT} upgrade -y
 
 which ansible >> /dev/null
 if [[ $? != 0 ]]; then

roles/elk/tasks/main.yml

@@ -22,6 +22,6 @@
       replace: 'xpack.license.self_generated.type: basic'
      
   - name: Execution du fichier docker-compose.yml
-    shell: docker-compose up -d
+    shell: docker compose up -d
     args:
       chdir: /root/elk

roles/goss/defaults/main.yml

@@ -1,3 +1,2 @@
 depl_url: "http://s-adm.gsb.adm/gsbstore"
 depl_goss: "goss"
-

roles/goss/tasks/main.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: goss binary exists
   stat: path=/usr/local/bin/goss
   register: gossbin
@@ -18,4 +17,3 @@
     mode: 0755
     remote_src: yes
   when: gossbin.stat.exists == false and ansible_hostname == "s-adm"
-

s-adm.yml

@@ -4,7 +4,6 @@
 
   roles:
     - base
-    - goss
     - s-ssh
     - dnsmasq
     - squid
@@ -12,3 +11,4 @@
     - snmp-agent
     - syslog-cli
     - post
+    - goss

scripts/debian11/chname

@@ -0,0 +1,14 @@
+#!/bin/bash
+if [[ $# != 1 ]] ; then
+	echo "$0 - renomme une VM"  
+	echo "usage : $0 <nouveaunom> "
+	exit 1
+fi
+if [[ $1 == "version" ]] ; then
+	echo 'chname v1.1 pour debian 11'
+	exit 0
+fi
+oldname=$(hostname)
+sed -i "s/${oldname}/$1/g" /etc/host{s,name}
+echo 'redemarrer pour finaliser le changement du nom'
+exit 0

scripts/debian11/gsb-start

@@ -0,0 +1,11 @@
+#!/bin/bash
+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
+export DEPL=192.168.99.99
+bash gsbboot
+cd ../..
+bash pull-config

scripts/debian11/s-adm-start

@@ -0,0 +1,15 @@
+#!/bin/bash
+apt-get  update
+#apt upgrade -y;
+mkdir -p tools/ansible
+cd tools/ansible
+git clone https://gitea.lyc-lecastel.fr/gadmin/gsb2023.git;
+cd gsb2023/pre
+bash inst-depl
+cd /var/www/html/gsbstore
+bash getall
+cd /root/tools/ansible/gsb2023/pre
+bash gsbboot
+cd ..
+bash pull-config
+

scripts/mkvm

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-mkvmrelease="v1.2.1"
+mkvmrelease="v1.2.2"
 
-ovarelease="2023a"
-ovafogrelease="2023a"
+ovarelease="2023b"
+ovafogrelease="2023b"
 ovafile="$HOME/Téléchargements/debian-bullseye-gsb-${ovarelease}.ova"
 ovafilefog="$HOME/Téléchargements/debian-buster-gsb-${ovafogrelease}.ova"
 deletemode=0
@@ -96,6 +96,8 @@ 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-elk" ]] ; 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-lb-web1" ]] ; then

scripts/mkvm.ps1

@@ -3,9 +3,9 @@
 
 #mkvm pour toutes les vms
 
-$mkvmrelease="v1.2"
-$ovarelease="2023a"
-$ovafogrelease="2023a"
+$mkvmrelease="v1.2.2"
+$ovarelease="2023b"
+$ovafogrelease="2023b"
 $ovafile="$HOME\Downloads\debian-bullseye-gsb-${ovarelease}.ova"
 $ovafilefog="$HOME\Downloads\debian-buster-gsb-${ovafogrelease}.ova"
 $vboxmanage="C:\Program Files\Oracle\VirtualBox\VBoxManage.exe"
@@ -87,6 +87,11 @@ elseif (((((((($args[0] -eq "s-elk") `
 	create_vm $args[0]
 	create_if $args[0] "int" 1 "n-adm"
 	create_if $args[0] "int" 2 "n-infra"
+	if ($args[0] -eq "s-elk") {
+
+		& "$vboxmanage" modifyvm "$args[0]" --memory 4096
+		Write-Host "$args[0] : 4096 RAM OK"
+	}
 }
 
 elseif ($args[0] -eq "s-fog") {
@@ -153,4 +158,4 @@ elseif ($args[0] -eq "r-vp2") {
 
 else {
 	usage
-}
+}

scripts/r-vp2-post.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #recuperation du fichier de config
-wget http://r-vp1.gsb.adm:8000/wg0-b.qconf
+wget http://r-vp1.gsb.adm:8800/wg0-b.conf
 #renomage fichier et mv
 mv ./wg0-b.conf /etc/wireguard/wg0.conf
 #activation interface wg0