README.md

README.md

@@ -90,8 +90,8 @@ bash chname <nouveau_nom_de_machine>` , puis redémarrer
     cd gsb2024/pre
     bash inst-depl
     cd /root/tools/ansible/gsb2024/pre
-    bash gsbboot
-    cd .. ; bash pull-config
+    DEPL=192.168.99.99 bash gsbboot
+    cd ../.. ; bash pull-config
 ```
   - redémarrer
   - la machine **s-adm** doit etre opérationnelle
@@ -121,8 +121,7 @@ mkdir -p tools/ansible ; cd tools/ansible
 git clone https://gitea.lyc-lecastel.fr/gsb/gsb2024.git
 cd gsb2024/pre
 DEPL=192.168.99.99 bash gsbboot
-cd ../..
-bash pull-config
+cd ../.. ; bash pull-config
 ```
 
 #### Etape 3

roles/zabbix-cli/tasks/main.yml

@@ -18,16 +18,11 @@
         state: present
 
     - name: Enable Zabbix agent service
-      systemd:
+      service:
         name: zabbix-agent
         state: restarted
         enabled: yes
         
-    - name: Rm package
-      file:
-        path: "/tmp/zabbix-release_6.4-1+debian12_all.deb"
-        state: absent
-
     - name: config
       template:
         src: zabbix_agentd.conf.temp

s-adm.yml

@@ -8,7 +8,7 @@
     - dnsmasq
     - squid
 #    - local-store
-#    - zabbix-cli
+#    #- zabbix-cli
     ## - syslog-cli
     - post
 #    - goss

s-appli.yml

@@ -8,7 +8,7 @@
     - appli
     - ssh-cli
     # - syslog-cli
-    - zabbix-cli
+    #- zabbix-cli
     - ssl-apache
     - post
 

s-backup.yml

@@ -6,7 +6,7 @@
     - base
     - goss
 #   - proxy3
-    - zabbix-cli
+    #- zabbix-cli
 #   - ssh-cli
     # - syslog-cli
     - smb-backup

s-infra.yml

@@ -4,7 +4,7 @@
   #  include: config.yml
   roles:
     - base
-    - zabbix-cli 
+    #- zabbix-cli 
     - goss  
     - dns-master
     - webautoconf

s-itil.yml

@@ -13,7 +13,7 @@
   roles:
     - base
     - goss
-    - zabbix-cli 
+    #- zabbix-cli 
     - glpi
     - ssh-cli
     # - syslog-cli

s-proxy.yml

@@ -6,7 +6,7 @@
     - base
     - goss
     - squid
-    - zabbix-cli
+    #- zabbix-cli
     - ssh-cli
     # - syslog-cli
     - post

scripts/mkvm

@@ -1,19 +1,21 @@
 #!/bin/bash
 
-mkvmrelease="v1.3.1"
+mkvmrelease="v1.3.2"
 
 ovarelease="2023c"
 ovafogrelease="2024a"
 #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-bullseye-gsb-${ovafogrelease}.ova"
+startmode=0
 deletemode=0
 
 usage () {
 	echo "$0 - version ${mkvmrelease} - Ova version ${ovarelease}"
 	echo "$0 : creation VM et parametrage interfaces"
-	echo "usage : $0 [-r] <s-adm|s-infra|r-int|r-ext|s-proxy|s-mon|s-appli|s-backup|s-itil|s-ncx|s-fog>"
-	echo "       option -r : efface vm existante avant creation nouvelle"
+	echo "usage : $0 [-r] [-s] <s-adm|s-infra|r-int|r-ext|s-proxy|s-mon|s-appli|s-backup|s-itil|s-ncx|s-fog>"
+	echo "       option -r : efface VM existante avant creation nouvelle"
+	echo "       option -s : start VM apres creation"
 	exit 1
 }
 
@@ -59,12 +61,19 @@ fi
 if [[ $1 == "--help" ]] || [[ $1 == "-h" ]] || [[ $1 == "-V" ]] ; then
 	usage
 fi
-if [[ $1 == "-r" ]] ; then
-	deletemode=1
-	shift
-fi
-vm="$1"
-
+while [[ -n "$1" ]] ; do
+	if [[ "$1" == "-s" ]] ; then
+		startmode=1
+		shift
+	elif [[ "$1" == "-r" ]] ; then
+		deletemode=1
+		shift
+	else
+		parm=$1
+		shift
+	fi
+done
+vm="${parm}"
 create_vm "${vm}"
 if [[ "${vm}" == "s-adm" ]] ; then
 	bash addint.s-adm
@@ -123,3 +132,6 @@ else
 	echo "$0 : vm ${vm} non prevue "
         exit 2	
 fi	
+if [[ $startmode == 1 ]] ; then
+	vboxmanage startvm "${vm}" --type headless
+fi