modif sur README.md

merge

README.md

@@ -1,9 +1,14 @@
 # gsb2023
 
+2023-01-06 
+
 Environnement et playbooks ansible pour le projet GSB 2023
 
 ## Quickstart
-prérequis : une machine Debian Bullseye
+prérequis : 
+  * une machine Debian Bullseye
+  * VirtualBox
+
 
 
 ## Les machines
@@ -20,7 +25,7 @@ prérequis : une machine Debian Bullseye
 ## Installation
 
 On utilisera l'image de machine virtuelle suivante : 
-  * **debian-bullseye-2023a.ova** (2022-05-07)
+  * **debian-bullseye-2023a.ova** (2023-01-06)
     * Debian Bullseye 11 - 2 cartes - 1 Go - stockage 20 Go
 
 
@@ -35,7 +40,7 @@ On utilisera l'image de machine virtuelle suivante :
     bash inst-depl
     cd /var/www/html/gsbstore
     bash getall
-    cd /root/tools/ansible/gsb022/pre
+    cd /root/tools/ansible/gsb023/pre
     bash gsbboot
     cd .. ; bash pull-config
 ```
@@ -51,7 +56,7 @@ On utilisera l'image de machine virtuelle suivante :
   - cloner le dépot : 
 ```shell
 mkdir -p tools/ansible ; cd tools/ansible
-git clone https://gitea.lyc-lecastel.fr/gadmin/gsb2022.git
+git clone https://gitea.lyc-lecastel.fr/gadmin/gsb2023.git
 cd gsb2023/pre
 export DEPL=192.168.99.99
 bash gsbboot

goss/s-mon.yaml

@@ -1,26 +1,27 @@
 file:
-  /etc/icinga/htpasswd.users:
+  /etc/nagios4/htdigest.users:
     exists: true
-    mode: "0644"
-    size: 26
-    owner: root
-    group: root
+    mode: "0640"
+    owner: nagios
+    group: www-data
     filetype: file
-    contains: []
+    contains: [nagiosadmin]
 package:
   apache2:
     installed: true
   nagios-snmp-plugins:
     installed: true
-  icinga:
+  nagios4:
     installed: true
   snmp:
     installed: true
+  python3-passlib:
+    installed: true
 port:
-  tcp6:80:
+  tcp:80:
     listening: true
     ip:
-    - '::'
+    - 0.0.0.0
   udp:514:
     listening: true
     ip:
@@ -29,7 +30,7 @@ service:
   apache2:
     enabled: true
     running: true
-  icinga:
+  nagios4:
     enabled: true
     running: true
 command:
@@ -42,19 +43,19 @@ command:
 process:
   apache2:
     running: true
-  icinga:
+  nagios4:
     running: true
 interface:
   enp0s3:
     exists: true
     addrs:
-    - 192.168.99.8/24
+    - 192.168.99.104/24
   enp0s8:
     exists: true
     addrs:
     - 172.16.0.8/24
 http:
-  http://localhost/icinga:
+  http://localhost/nagios4:
     status: 401
     allow-insecure: false
     no-follow-redirects: false

pre/pull-config

@@ -11,6 +11,6 @@ dir=/root/tools/ansible
 cd  "${dir}" || exit 1
 
 hostname  > hosts
-ansible-pull -i "${dir}/hosts"  -U "${UREP}"
+ansible-pull -i "${dir}/hosts"  -C main -U "${UREP}"
 
 exit 0

pull-config

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [ -z ${UREP+x} ]; then 
-	UREP=https://gitea.lyc-lecastel.fr/gadmin/gsb2022.git 
+if [ -z ${UREP+x} ]; then
+	UREP=https://gitea.lyc-lecastel.fr/gadmin/gsb2023.git 
 fi
 
 dir=/root/tools/ansible

roles/goss/tasks/main.yml

@@ -3,19 +3,19 @@
 - name: goss binary exists
   stat: path=/usr/local/bin/goss
   register: gossbin
- 
+
 - name: install goss sur machine standard
-  get_url: 
-    url: "{{ depl_url }}/{{ depl_goss }}"
+  get_url:
+    url: "{{ depl_url }}/{{ depl_goss }}"
     dest: /usr/local/bin/{{ depl_goss }}
     mode: 0755
-  when: gossbin.stat.exists == False and ansible_hostname != "s-adm"
+  when: gossbin.stat.exists == false and ansible_hostname != "s-adm"
 
 - name: install goss sur s-adm
-  copy: 
+  copy:
     src: "/var/www/html/gsbstore/{{ depl_goss }}"
     dest: /usr/local/bin/{{ depl_goss }}
     mode: 0755
     remote_src: yes
-  when: gossbin.stat.exists == False and ansible_hostname == "s-adm"
+  when: gossbin.stat.exists == false and ansible_hostname == "s-adm"
 

scripts/mkvm

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ovarelease="2023b"
+ovarelease="2023a"
 ovafile="$HOME/Téléchargements/debian-bullseye-gsb-${ovarelease}.ova"
 
 
@@ -37,6 +37,10 @@ create_if () {
 }
 
 
+if [[ $# != 1 ]] ; then
+	usage
+fi
+
 vm=$1
 
 create_vm "${vm}"