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

merge

README.md

@@ -56,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/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:

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

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"
 

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