modification roles glpi

mise a jour role glpi
2024-01-11 11:18:53 +01:00 · 2024-01-11 09:44:41 +01:00
138 changed files with 864 additions and 4419 deletions
--- a/README.md
+++ b/README.md
@ -1,34 +1,34 @@
 # gsb2024

-2024-01-19 11h45 ps
+2024-12-21 ps

-Environnement et playbooks **ansible** pour le projet **GSB 2024**
+Environnement et playbooks ansible pour le projet GSB 2024

 ## Quickstart

 Prérequis : 
-  * une machine **Linux Debian Bookworm** ou **Windows**
+  * une machine LInux Debian Bookworm ou Windows
  * VirtualBox
  * git 
  * fichier machines virtuelles **ova** :
    * **debian-bookworm-gsb-2023c.ova**
-    * **debian-bullseye-gsb-2024a.ova**
+    * **debian-buster-gsb-2023a.ova**


 ## Les machines 

-  * **s-adm** : routeur adm, DHCP + NAT, déploiement, proxy squid 
+  * **s-adm** : routeur adm, DHCP + NAT, deploiement, proxy squid 
  * **s-infra** : DNS maitre, autoconfiguration navigateurs avec **wpad**
  * **r-int** : routage, DHCP 
  * **r-ext** : routage, NAT
-  * **s-proxy** : proxy **squid**
+  * **s-proxy** : squid
  * **s-itil** : serveur GLPI
-  * **s-backup** : DNS esclave + sauvegarde s-win (SMB), Stork et Gotify
-  * **s-mon** : supervision avec **Nagios4/Zabbix**, notifications et journald
+  * **s-backup** : DNS esclave + sauvegarde s-win (SMB)
+  * **s-mon** : supervision avec **Nagios4**, notifications et syslog
  * **s-fog** : deploiement postes de travail avec **FOG**
  * **s-win** : Windows Server 2019, AD, DNS, DHCP, partage fichiers
-  * **s-nxc** : NextCloud avec **docker** via proxy inverse **traefik** et certificat auto-signé
-  * **s-elk** : pile **ELK** dockerisée
+  * **s-nxc** : NextCloud avec **docker** 
+  * **s-elk** : pile ELK dockerisée
  * **s-lb**  : Load Balancer **HaProxy** pour application Wordpress (DMZ)
  * **r-vp1** : Routeur VPN Wireguard coté siège
  * **r-vp2** : Routeur VPN Wireguard coté agence, DHCP
@ -38,8 +38,6 @@ Prérequis :
  * **s-lb-web2** : Serveur Wordpress 2 Load Balancer
  * **s-lb-db** : Serveur Mariadb pour Wordpress
  * **s-nas** : Serveur NFS pour application Wordpress avec LB
-  * **s-kea1** : Serveur DHCP Kea HA 1
-  * **s-kea2** : Serveur DHCP Kea HA 2


 ## Les playbooks
@ -53,8 +51,8 @@ On utilisera les images de machines virtuelle suivantes :
    * Debian Bookworm 12.4 - 2 cartes - 1 Go - Stockage 20 Go

 et pour **s-fog** : 
-  * **debian-bullseye-2024a.ova** (2024-01-06)
-    * Debian Bullseye 11.8 - 2 cartes - 1 Go - stockage 20 Go
+  * **debian-buster-2023a.ova** (2023-01-06)
+    * Debian Buster 10 - 2 cartes - 1 Go - stockage 20 Go

 Les images **.ova** doivent etre stockées dans le répertoire habituel de téléchargement de l'utilisateur courant.

@ -74,10 +72,6 @@ mkvm -r s-adm
 ```

 ### Machine s-adm
-
-La machine **-sadm** est la première machine à installer.
-
-
  * créer la machine virtuelle **s-adm** avec **mkvm** comme décrit plus haut.
  * démarrer la VM puis ouvir une session
  * utiliser le script de renommage comme suit :
@ -91,49 +85,48 @@ bash chname <nouveau_nom_de_machine>` , puis redémarrer
    git clone https://gitea.lyc-lecastel.fr/gsb/gsb2024.git
    cd gsb2024/pre
    bash inst-depl
-    cd /root/tools/ansible/gsb2024/pre
-    DEPL=192.168.99.99 bash gsbboot
-    cd ../.. ; bash pull-config
+    cd /var/www/html/gsbstore
+    bash getall
+    cd /root/tools/ansible/gsb024/pre
+    bash gsbboot
+    cd .. ; bash pull-config
 ```
  - redémarrer
-  - la machine **s-adm** doit etre opérationnelle
  
 ### Pour chaque machine

-####  Etape 1 - Nommage machine
+####  Etape 1

  - créer la machine avec **mkvm -r**, les cartes réseau sont paramétrées par **mkvm** selon les spécifications 
  - ouvrir une session sur la machine considérée
-  - renommer la machine soit
+  - renomme la machine soit
     * en utilisant le script de renommage comme suit : 
        ` /root/tools/ansible/gsb2024/scripts/chname <nouveau_nom_de_machine>`
-     * soit (ici on renomme la machine en **s-infra**) avec :  
+     * soit avec :  
 ```shell
-export HOST=s-infra   
-curl 192.168.99.99/gsbstore/inst1|bash
-reboot # on redemarre
+NHOST=mavm   
+sed -i "s/bookworm/${NHOST}/g" /etc/host{s,name}
+sudo reboot # on redemarre
 ``` 

-#### Etape 2 - installation outils, depot gsb2024 et lancement playbook
+#### Etape 2

  - utiliser le script **gsb-start** : `bash gsb-start`
  - ou sinon:
 ```shell
-curl 192.168.99.99/gsbstore/inst2|bash
+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
 ```
-  - le script recupere le dépot **gsb2024.git**
-  - il lance ensuite le script **pull-config** avec le script porant le nom de la machine
-  - on peut alors redémarrer

-#### Etape 3 - Redémarrage et tests
+#### Etape 3

  - redémarrer
-  - **Remarque** : une machine doit avoir été redémarrée pour prendre en charge la nouvelle configuration, en particulier la couche réseau et l'adressage.
-  - selon les situations, il est possible qu'un seul playbook ne soit pas suffisant pour installer complètement une machine. Dans ce cas de figure, le second playbook s'appelle **s-machine-post.yml**.
-Il est à lancer depuis ''tools/ansible/gsb2024'' :
-```shell
-ansible-playbook -i localhost, -c local s-machine-post.yml
-```
+  - **Remarque** : une machine doit avoir été redémarrée pour prendre en charge la nouvelle configuration
+

 ## Les tests

--- a/goss.yaml
+++ b/goss.yaml
@ -1,25 +0,0 @@
-port:
-  tcp:22:
-    listening: true
-    ip:
-    - 0.0.0.0
-  tcp6:22:
-    listening: true
-    ip:
-    - '::'
-service:
-  sshd:
-    enabled: true
-    running: true
-user:
-  sshd:
-    exists: true
-    uid: 101
-    gid: 65534
-    groups:
-    - nogroup
-    home: /run/sshd
-    shell: /usr/sbin/nologin
-process:
-  sshd:
-    running: true
--- a/goss/r-vp1.yaml
+++ b/goss/r-vp1.yaml
@ -1,20 +1,21 @@
 file:
  /etc/wireguard/wg0.conf:
    exists: true
-    mode: "0600"
+    mode: "0644"
    owner: root
    group: root
    filetype: file
-    contains: []
+    contains:
+    - AllowedIPs = 10.0.0.2/32, 172.16.128.0/24
 package:
  wireguard:
    installed: true
    versions:
-    - 1.0.20210914-1
+    - 1.0.20210223-1
  wireguard-tools:
    installed: true
    versions:
-    - 1.0.20210914-1+b1
+    - 1.0.20210223-1
 service:
  wg-quick@wg0:
    enabled: true
--- a/goss/r-vp2.yaml
+++ b/goss/r-vp2.yaml
@ -1,8 +1,7 @@
 file:
  /etc/wireguard/wg0.conf:
    exists: true
-    mode: "0600"
-    size: 374
+    mode: "0644"
    owner: root
    group: root
    filetype: file
@ -11,11 +10,11 @@ package:
  wireguard:
    installed: true
    versions:
-    - 1.0.20210914-1
+    - 1.0.20210223-1
  wireguard-tools:
    installed: true
    versions:
-    - 1.0.20210914-1+b1
+    - 1.0.20210223-1
 service:
  isc-dhcp-server:
    enabled: true
--- a/goss/s-adm.yaml
+++ b/goss/s-adm.yaml
@ -1,18 +1,6 @@
-file:
-    /var/www/html/gsbstore/getall:
-        exists: true
-        mode: "0644"
-        owner: root
-        group: root
-        filetype: file
-        contents: []
 package:
    dnsmasq:
        installed: true
-    lighttpd:
-        installed: true
-        versions:
-            - 1.4.69-1
    squid:
        installed: true
 addr:
@ -24,18 +12,10 @@ port:
        listening: true
        ip:
            - 0.0.0.0
-    tcp:80:
-        listening: true
-        ip:
-            - 0.0.0.0
    tcp6:53:
        listening: true
        ip:
            - '::'
-    tcp6:80:
-        listening: true
-        ip:
-            - '::'
    udp:53:
        listening: true
        ip:
@ -52,9 +32,6 @@ service:
    dnsmasq:
        enabled: true
        running: true
-    lighttpd:
-        enabled: true
-        running: true
    squid:
        enabled: true
        running: true
@ -84,8 +61,6 @@ dns:
 process:
    dnsmasq:
        running: true
-    lighttpd:
-        running: true
    squid:
        running: true
 interface:
--- a/goss/s-fog.yaml
+++ b/goss/s-fog.yaml
@ -1,77 +1,28 @@
-file:
-    /tftpboot/default.ipxe:
-        exists: true
-        mode: "0644"
-        owner: root
-        group: root
-        filetype: file
-        contains: []
-        contents: null
-package:
-    apache2:
-        installed: true
-        versions:
-            - 2.4.56-1~deb11u2
-    isc-dhcp-server:
-        installed: true
-        versions:
-            - 4.4.1-2.3+deb11u2
-    mariadb-server:
-        installed: true
-        versions:
-            - 1:10.5.21-0+deb11u1
-    tftpd-hpa:
-        installed: true
-        versions:
-            - 5.2+20150808-1.2
-port:
-    tcp:80:
-        listening: true
-        ip:
-            - 0.0.0.0
-    tcp:443:
-        listening: true
-        ip:
-            - 0.0.0.0
-    udp:67:
-        listening: true
-        ip:
-            - 0.0.0.0
-    udp:69:
-        listening: true
-        ip:
-            - 0.0.0.0
-service:
-    apache2:
-        enabled: true
-        running: true
-    isc-dhcp-server:
-        enabled: true
-        running: true
-    nfs-server:
-        enabled: true
-        running: true
-    tftpd-hpa:
-        enabled: true
-        running: true
-command:
-    ping -c 4 192.168.99.99:
-        exit-status: 0
-        stdout:
-            - 0% packet loss
-        stderr: []
-        timeout: 10000
-    ping -c 4 google.fr:
-        exit-status: 0
-        stdout:
-            - 0% packet loss
-        stderr: []
-        timeout: 10000
-process:
-    apache2:
-        running: true
 interface:
-    enp0s9:
-        exists: true
-        addrs:
-            - 172.16.64.16/24
+  enp0s3:
+    exists: true
+    addrs:
+    - 192.168.99.16/24
+interface:
+  enp0s8:
+    exists: true
+    addrs:
+    - 172.16.0.16/24
+interface:
+  enp0s9:
+    exists: true
+    addrs:
+    - 172.16.64.16/24
+command:
+  ping -c 4 192.168.99.99:
+    exit-status: 0
+    stdout:
+    - 0% packet loss
+    stderr: []
+    timeout: 10000
+  ping -c 4 google.fr:
+    exit-status: 0
+    stdout:
+    - 0% packet loss
+    stderr: []
+    timeout: 10000
--- a/goss/s-itil.yaml
+++ b/goss/s-itil.yaml
@ -1,87 +1,36 @@
 file:
-    /etc/nginx/sites-enabled/default:
-        exists: false
-        contents: []
-    /etc/nginx/sites-enabled/glpi:
-        exists: true
-        mode: "0644"
-        owner: root
-        group: root
-        filetype: file
-        contents: []
-    /var/www/html/glpi:
-        exists: true
-        mode: "0755"
-        owner: www-data
-        group: www-data
-        filetype: directory
-        contents: []
-    /var/www/html/glpicli:
-        exists: true
-        mode: "0775"
-        owner: www-data
-        group: www-data
-        filetype: directory
-        contents: []
-    /var/www/html/glpicli/GLPI-Agent-1.7-x64.msi:
-        exists: true
-        mode: "0644"
-        owner: root
-        group: root
-        filetype: file
-        contents: []
-port:
-    tcp:22:
-        listening: true
-        ip:
-            - 0.0.0.0
-    tcp:80:
-        listening: true
-        ip:
-            - 0.0.0.0
-    tcp:3306:
-        listening: true
-        ip:
-            - 127.0.0.1
-    tcp:9000:
-        listening: true
-        ip:
-            - 127.0.0.1
-    tcp:10050:
-        listening: true
-        ip:
-            - 0.0.0.0
+  /var/www/html/glpi:
+    exists: true
+    mode: "0755"
+    owner: www-data
+    group: www-data
+    filetype: directory
+
+  /var/www/html/ficlients:
+    exists: true
+    mode: "0775"
+    owner: www-data
+    group: www-data
+    filetype: directory
+
+  /var/www/html/glpi/plugins:
+    exists: true
+    mode: "0777"
+    filetype: directory
+
+  /var/www/html/index.nginx-debian.html:
+    exists: true
+    mode: "0775"
+    owner: www-data
+    group: www-data
+    filetype: file
+
 service:
-    mariadb.service:
-        enabled: true
-        running: true
-    nginx:
-        enabled: true
-        running: true
-    php8.2-fpm.service:
-        enabled: true
-        running: true
-    ssh:
-        enabled: true
-        running: true
-    systemd-journal-upload:
-        enabled: true
-        running: true
-    zabbix-agent:
-        enabled: true
-        running: true
-http:
-    http://s-itil.gsb.lan/:
-        status: 200
-        allow-insecure: false
-        no-follow-redirects: false
-        timeout: 5000
-        body: []
-        username: glpi
-        password: glpi
-    http://s-itil.gsb.lan/glpicli:
-        status: 200
-        allow-insecure: false
-        no-follow-redirects: false
-        timeout: 5000
-        body: []
+  mariadb:
+    enabled: true
+    running: true
+
+  nginx:
+    enabled: true
+    running: true
+
--- a/goss/s-kea1.yaml
+++ b/goss/s-kea1.yaml
@ -1,93 +0,0 @@
-file:
-    /etc/kea/kea-ctrl-agent.conf:
-        exists: true
-        mode: "0644"
-        owner: _kea
-        group: root
-        filetype: file
-        contents: []
-    /etc/kea/kea-dhcp4.conf:
-        exists: true
-        mode: "0644"
-        owner: _kea
-        group: root
-        filetype: file
-        contents: []
-    /tmp/kea4-ctrl-socket:
-        exists: true
-        mode: "0755"
-        size: 0
-        owner: _kea
-        group: _kea
-        filetype: socket
-        contains: []
-        contents: null
-    /usr/lib/x86_64-linux-gnu/kea:
-        exists: true
-        mode: "0755"
-        owner: root
-        group: root
-        filetype: directory
-        contents: []
-package:
-    isc-kea-common:
-        installed: true
-        versions:
-            - 2.4.1-isc20231123184533
-    isc-kea-ctrl-agent:
-        installed: true
-        versions:
-            - 2.4.1-isc20231123184533
-    isc-kea-dhcp4:
-        installed: true
-        versions:
-            - 2.4.1-isc20231123184533
-    isc-kea-hooks:
-        installed: true
-        versions:
-            - 2.4.1-isc20231123184533
-    libmariadb3:
-        installed: true
-        versions:
-            - 1:10.11.4-1~deb12u1
-    mariadb-common:
-        installed: true
-        versions:
-            - 1:10.11.4-1~deb12u1
-    mysql-common:
-        installed: true
-        versions:
-            - 5.8+1.1.0
-addr:
-    udp://172.16.64.254:67:
-        local-address: 127.0.0.1
-        reachable: true
-        timeout: 500
-port:
-    tcp:8000:
-        listening: true
-        ip:
-            - 172.16.0.20
-service:
-    isc-kea-ctrl-agent.service:
-        enabled: true
-        running: true
-    isc-kea-dhcp4-server.service:
-        enabled: true
-        running: true
-interface:
-    enp0s3:
-        exists: true
-        addrs:
-            - 192.168.99.20/24
-        mtu: 1500
-    enp0s8:
-        exists: true
-        addrs:
-            - 172.16.0.20/24
-        mtu: 1500
-    enp0s9:
-        exists: true
-        addrs:
-            - 172.16.64.20/24
-        mtu: 1500
--- a/goss/s-kea2.yaml
+++ b/goss/s-kea2.yaml
@ -1,93 +0,0 @@
-file:
-    /etc/kea/kea-ctrl-agent.conf:
-        exists: true
-        mode: "0644"
-        owner: _kea
-        group: root
-        filetype: file
-        contents: []
-    /etc/kea/kea-dhcp4.conf:
-        exists: true
-        mode: "0644"
-        owner: _kea
-        group: root
-        filetype: file
-        contents: []
-    /tmp/kea4-ctrl-socket:
-        exists: true
-        mode: "0755"
-        size: 0
-        owner: _kea
-        group: _kea
-        filetype: socket
-        contains: []
-        contents: null
-    /usr/lib/x86_64-linux-gnu/kea:
-        exists: true
-        mode: "0755"
-        owner: root
-        group: root
-        filetype: directory
-        contents: []
-package:
-    isc-kea-common:
-        installed: true
-        versions:
-            - 2.4.1-isc20231123184533
-    isc-kea-ctrl-agent:
-        installed: true
-        versions:
-            - 2.4.1-isc20231123184533
-    isc-kea-dhcp4:
-        installed: true
-        versions:
-            - 2.4.1-isc20231123184533
-    isc-kea-hooks:
-        installed: true
-        versions:
-            - 2.4.1-isc20231123184533
-    libmariadb3:
-        installed: true
-        versions:
-            - 1:10.11.4-1~deb12u1
-    mariadb-common:
-        installed: true
-        versions:
-            - 1:10.11.4-1~deb12u1
-    mysql-common:
-        installed: true
-        versions:
-            - 5.8+1.1.0
-addr:
-    udp://172.16.64.254:67:
-        local-address: 127.0.0.1
-        reachable: true
-        timeout: 500
-port:
-    tcp:8000:
-        listening: true
-        ip:
-            - 172.16.0.21
-service:
-    isc-kea-ctrl-agent.service:
-        enabled: true
-        running: true
-    isc-kea-dhcp4-server.service:
-        enabled: true
-        running: true
-interface:
-    enp0s3:
-        exists: true
-        addrs:
-            - 192.168.99.21/24
-        mtu: 1500
-    enp0s8:
-        exists: true
-        addrs:
-            - 172.16.0.21/24
-        mtu: 1500
-    enp0s9:
-        exists: true
-        addrs:
-            - 172.16.64.21/24
-        mtu: 1500
--- a/goss/s-lb-bd.yaml
+++ b/goss/s-lb-bd.yaml
@ -1,38 +1,21 @@
-addr:
-    tcp://192.168.102.1:80:
-        reachable: true
-        timeout: 500
-    tcp://192.168.102.2:80:
-        reachable: true
-        timeout: 500
-service:
-    mariadb:
-        enabled: true
-        running: true
-    mysql:
-        enabled: true
-        running: true
-user:
-    mysql:
-        exists: true
-        uid: 104
-        gid: 111
-        groups:
-            - mysql
-        home: /nonexistent
-        shell: /bin/false
-group:
-    mysql:
-        exists: true
-        gid: 111
+package:
+  mysql-server:
+    installed: true
+    versions:
+    - 5.5.54-0+deb8u1
+command:
+  egrep "#bind-address" /etc/mysql/my.cnf:
+    exit-status: 0
+    stdout:
+    - "#bind-address\t\t= 127.0.0.1"
+    stderr: []
+    timeout: 10000
 interface:
-    enp0s3:
-        exists: true
-        addrs:
-            - 192.168.99.154/24
-        mtu: 1500
-    enp0s8:
-        exists: true
-        addrs:
-            - 192.168.102.254/24
-        mtu: 1500
+  enp0s3:
+    exists: true
+    addrs:
+    - 192.168.99.13/24
+  enp0s8:
+    exists: true
+    addrs:
+    - 192.168.102.50/24
--- a/goss/s-lb-web1.yaml
+++ b/goss/s-lb-web1.yaml
@ -1,62 +1,63 @@
 package:
-    apache2:
-        installed: true
-        versions:
-            - 2.4.57-2
-    nfs-common:
-        installed: true
-        versions:
-            - 1:2.6.2-4
+  apache2:
+    installed: true
+    versions:
+    - 2.4.10-10+deb8u7
+  php5:
+    installed: true
+    versions:
+    - 5.6.29+dfsg-0+deb8u1
 port:
-    tcp6:80:
-        listening: true
-        ip:
-            - '::'
+  tcp:22:
+    listening: true
+    ip:
+    - 0.0.0.0
+  tcp6:22:
+    listening: true
+    ip:
+    - '::'
+  tcp6:80:
+    listening: true
+    ip:
+    - '::'
 service:
-    apache2:
-        enabled: true
-        running: true
-    nfs-common:
-        enabled: false
-        running: false
+  apache2:
+    enabled: true
+    running: true
+  sshd:
+    enabled: true
+    running: true
+user:
+  sshd:
+    exists: true
+    uid: 105
+    gid: 65534
+    groups:
+    - nogroup
+    home: /var/run/sshd
+    shell: /usr/sbin/nologin
+command:
+  egrep 192.168.102.14:/export/www /etc/fstab:
+    exit-status: 0
+    stdout:
+    - 192.168.102.14:/export/www /var/www/html nfs _netdev rw 0 0
+    stderr: []
+    timeout: 10000
 process:
-    apache2:
-        running: true
-mount:
-    /var/www/html:
-        exists: true
-        opts:
-            - rw
-            - relatime
-        vfs-opts:
-            - rw
-            - vers=4.2
-            - rsize=131072
-            - wsize=131072
-            - namlen=255
-            - hard
-            - proto=tcp
-            - timeo=600
-            - retrans=2
-            - sec=sys
-            - clientaddr=192.168.102.1
-            - local_lock=none
-            - addr=192.168.102.253
-        source: 192.168.102.253:/home/wordpress
-        filesystem: nfs4
+  apache2:
+    running: true
+  sshd:
+    running: true
 interface:
-    enp0s3:
-        exists: true
-        addrs:
-            - 192.168.99.101/24
-        mtu: 1500
-    enp0s8:
-        exists: true
-        addrs:
-            - 192.168.101.1/24
-        mtu: 1500
-    enp0s9:
-        exists: true
-        addrs:
-            - 192.168.102.1/24
-        mtu: 1500
+  enp0s3:
+    exists: true
+    addrs:
+    - 192.168.99.11/24
+  enp0s8:
+    exists: true
+    addrs:
+    - 192.168.101.1/24
+  enp0s9:
+    exists: true
+    addrs:
+    - 192.168.102.1/24
--- a/goss/s-lb-web2.yaml
+++ b/goss/s-lb-web2.yaml
@ -1,62 +1,63 @@
 package:
-    apache2:
-        installed: true
-        versions:
-            - 2.4.57-2
-    nfs-common:
-        installed: true
-        versions:
-            - 1:2.6.2-4
+  apache2:
+    installed: true
+    versions:
+    - 2.4.10-10+deb8u7
+  php5:
+    installed: true
+    versions:
+    - 5.6.29+dfsg-0+deb8u1
 port:
-    tcp6:80:
-        listening: true
-        ip:
-            - '::'
+  tcp:22:
+    listening: true
+    ip:
+    - 0.0.0.0
+  tcp6:22:
+    listening: true
+    ip:
+    - '::'
+  tcp6:80:
+    listening: true
+    ip:
+    - '::'
 service:
-    apache2:
-        enabled: true
-        running: true
-    nfs-common:
-        enabled: false
-        running: false
+  apache2:
+    enabled: true
+    running: true
+  sshd:
+    enabled: true
+    running: true
+user:
+  sshd:
+    exists: true
+    uid: 105
+    gid: 65534
+    groups:
+    - nogroup
+    home: /var/run/sshd
+    shell: /usr/sbin/nologin
+command:
+  egrep 192.168.102.14:/export/www /etc/fstab:
+    exit-status: 0
+    stdout:
+    - 192.168.102.14:/export/www /var/www/html nfs _netdev rw 0 0
+    stderr: []
+    timeout: 10000
 process:
-    apache2:
-        running: true
-mount:
-    /var/www/html:
-        exists: true
-        opts:
-            - rw
-            - relatime
-        vfs-opts:
-            - rw
-            - vers=4.2
-            - rsize=131072
-            - wsize=131072
-            - namlen=255
-            - hard
-            - proto=tcp
-            - timeo=600
-            - retrans=2
-            - sec=sys
-            - clientaddr=192.168.102.2
-            - local_lock=none
-            - addr=192.168.102.253
-        source: 192.168.102.253:/home/wordpress
-        filesystem: nfs4
+  apache2:
+    running: true
+  sshd:
+    running: true
 interface:
-    enp0s3:
-        exists: true
-        addrs:
-            - 192.168.99.102/24
-        mtu: 1500
-    enp0s8:
-        exists: true
-        addrs:
-            - 192.168.101.2/24
-        mtu: 1500
-    enp0s9:
-        exists: true
-        addrs:
-            - 192.168.102.2/24
-        mtu: 1500
+  enp0s3:
+    exists: true
+    addrs:
+    - 192.168.99.12/24
+  enp0s8:
+    exists: true
+    addrs:
+    - 192.168.101.2/24
+  enp0s9:
+    exists: true
+    addrs:
+    - 192.168.102.2/24
--- a/goss/s-lb.yaml
+++ b/goss/s-lb.yaml
@ -1,55 +1,28 @@
-package:
-    haproxy:
-        installed: true
-        versions:
-            - 2.6.12-1+deb12u1
-addr:
-    tcp://192.168.101.1:80:
-        reachable: true
-        timeout: 500
-    tcp://192.168.101.2:80:
-        reachable: true
-        timeout: 500
 port:
-    tcp:80:
-        listening: true
-        ip:
-            - 192.168.100.10
+  tcp:80:
+    listening: true
+    ip:
+    - 192.168.100.11
 service:
-    haproxy:
-        enabled: true
-        running: true
-user:
-    haproxy:
-        exists: true
-        uid: 104
-        gid: 111
-        groups:
-            - haproxy
-        home: /var/lib/haproxy
-        shell: /usr/sbin/nologin
-group:
-    haproxy:
-        exists: true
-        gid: 111
-process:
-    haproxy:
-        running: true
+  haproxy:
+    enabled: true
+    running: true
+  sshd:
+    enabled: true
+    running: true
 interface:
-    enp0s3:
-        exists: true
-        addrs:
-            - 192.168.99.100/24
-        mtu: 1500
-    enp0s8:
-        exists: true
-        addrs:
-            - 192.168.100.10/24
-        mtu: 1500
-http:
-    http://192.168.100.10/:
-        status: 200
-        allow-insecure: false
-        no-follow-redirects: false
-        timeout: 5000
-        body: []
+  enp0s3:
+    exists: true
+    addrs:
+    - 192.168.99.100/24
+    mtu: 1500
+  enp0s8:
+    exists: true
+    addrs:
+    - 192.168.100.11/24
+    mtu: 1500
+  enp0s9:
+    exists: true
+    addrs:
+    - 192.168.101.254/24
+    mtu: 1500
--- a/goss/s-mon.yaml
+++ b/goss/s-mon.yaml
@ -1,62 +1,63 @@
 file:
-    /etc/systemd/system/systemd-journal-remote.service:
-        exists: true
-        mode: "0644"
-        owner: root
-        group: root
-        filetype: file
-        contents: []
-    /var/log/journal/remote:
-        exists: true
-        mode: "0755"
-        owner: systemd-journal-remote
-        group: systemd-journal-remote
-        filetype: directory
-        contents: []
+  /etc/nagios4/htdigest.users:
+    exists: true
+    mode: "0640"
+    owner: nagios
+    group: www-data
+    filetype: file
+    contains: [nagiosadmin]
 package:
-    apache2:
-        installed: true
-        versions:
-            - 2.4.57-2
-    mariadb-server:
-        installed: true
-        versions:
-            - 1:10.11.4-1~deb12u1
-    systemd-journal-remote:
-        installed: true
-        versions:
-            - 252.19-1~deb12u1
+  apache2:
+    installed: true
+  nagios-snmp-plugins:
+    installed: true
+  nagios4:
+    installed: true
+  snmp:
+    installed: true
+  python3-passlib:
+    installed: true
+port:
+  tcp:80:
+    listening: true
+    ip:
+    - 0.0.0.0
+  udp:514:
+    listening: true
+    ip:
+    - 0.0.0.0
 service:
-    apache2:
-        enabled: true
-        running: true
-    mariadb.service:
-        enabled: true
-        running: true
-    systemd-journal-remote.socket:
-        enabled: true
-        running: true
-    zabbix-agent:
-        enabled: true
-        running: true
-    zabbix-server:
-        enabled: true
-        running: true
+  apache2:
+    enabled: true
+    running: true
+  nagios4:
+    enabled: true
+    running: true
+command:
+  sysctl net.ipv4.ip_forward:
+    exit-status: 0
+    stdout:
+    - net.ipv4.ip_forward = 0
+    stderr: []
+    timeout: 10000
+process:
+  apache2:
+    running: true
+  nagios4:
+    running: true
 interface:
-    enp0s3:
-        exists: true
-        addrs:
-            - 192.168.99.8/24
-        mtu: 1500
-    enp0s8:
-        exists: true
-        addrs:
-            - 172.16.0.8/24
-        mtu: 1500
+  enp0s3:
+    exists: true
+    addrs:
+    - 192.168.99.8/24
+  enp0s8:
+    exists: true
+    addrs:
+    - 172.16.0.8/24
 http:
-    http://s-mon.gsb.lan/zabbix:
-        status: 200
-        allow-insecure: false
-        no-follow-redirects: false
-        timeout: 5000
-        body: []
+  http://localhost/nagios4:
+    status: 401
+    allow-insecure: false
+    no-follow-redirects: false
+    timeout: 5000
+    body: []
--- a/goss/s-nas.yaml
+++ b/goss/s-nas.yaml
@ -1,55 +0,0 @@
-file:
-    /home/wordpress:
-        exists: true
-        mode: "0755"
-        owner: www-data
-        group: www-data
-        filetype: directory
-        contents: []
-package:
-    file:
-        installed: true
-        versions:
-            - 1:5.44-3
-    nfs-common:
-        installed: true
-        versions:
-            - 1:2.6.2-4
-    nfs-kernel-server:
-        installed: true
-        versions:
-            - 1:2.6.2-4
-addr:
-    tcp://192.168.102.1:80:
-        reachable: true
-        timeout: 500
-    tcp://192.168.102.2:80:
-        reachable: true
-        timeout: 500
-service:
-    nfs-common:
-        enabled: false
-        running: false
-    nfs-kernel-server:
-        enabled: true
-        running: true
-    nfs-mountd:
-        enabled: true
-        running: true
-    nfs-server:
-        enabled: true
-        running: true
-    nfs-utils:
-        enabled: true
-        running: false
-interface:
-    enp0s3:
-        exists: true
-        addrs:
-            - 192.168.99.153/24
-        mtu: 1500
-    enp0s8:
-        exists: true
-        addrs:
-            - 192.168.102.253/24
-        mtu: 1500
--- a/goss/s-nxc.yaml
+++ b/goss/s-nxc.yaml
@ -1,145 +0,0 @@
-file:
-  /root/nxc:
-    exists: true
-    mode: "0755"
-      #size: 4096
-      #owner: root
-      #group: root
-    filetype: directory
-    contains: []
-
-  /root/nxc/certs:
-    exists: true
-    mode: "0755"
-      #size: 4096
-      #owner: root
-      #group: root
-    filetype: directory
-    contains: []
-
-  /root/nxc/config:
-    exists: true
-    mode: "0755"
-      #size: 4096
-      #owner: root
-      #group: root
-    filetype: directory
-    contains: []
-
-  /root/nxc/config/dynamic.yml:
-    exists: true
-    mode: "0644"
-      #size: 415
-      #owner: root
-      #group: root
-    filetype: file
-    contains: []
-
-  /root/nxc/config/static.yml:
-    exists: true
-    mode: "0644"
-      #size: 452
-      #owner: root
-      #group: root
-    filetype: file
-    contains: []
-
-  /root/nxc/docker-compose.yml:
-    exists: true
-    mode: "0644"
-      #size: 2135
-      #owner: root
-      #group: root
-    filetype: file
-    contains: []
-
-  /root/nxc/nxc-debug.sh:
-    exists: true
-    mode: "0755"
-      #size: 64
-      #owner: root
-      #group: root
-    filetype: file
-    contains: []
-
-  /root/nxc/nxc-prune.sh:
-    exists: true
-    mode: "0755"
-      #size: 110
-      #owner: root
-      #group: root
-    filetype: file
-    contains: []
-
-  /root/nxc/nxc-start.sh:
-    exists: true
-    mode: "0755"
-      #size: 34
-      #owner: root
-      #group: root
-    filetype: file
-    contains: []
-
-  /root/nxc/nxc-stop.sh:
-    exists: true
-    mode: "0755"
-      #size: 32
-      #owner: root
-      #group: root
-    filetype: file
-    contains: []
-
-  /usr/local/bin/mkcert:
-    exists: true
-    mode: "0755"
-      #size: 4788866
-      #owner: root
-      #group: root
-    filetype: file
-    contains: []
-
-      #addr:
-      #tcp://s-nxc.gsb.lan:443:
-      #reachable: true
-      #timeout: 500
-
-port:
-  tcp:22:
-    listening: true
-    ip:
-    - 0.0.0.0
-
-  tcp:80:
-    listening: true
-    ip: []
-
-  tcp:443:
-    listening: true
-    ip: []
-
-    #tcp:8081:
-    #listening: true
-    #ip:
-    #- 0.0.0.0
-
-interface:
-  enp0s3:
-    exists: true
-    addrs:
-    - 192.168.99.7/24
-    mtu: 1500
-
-  enp0s8:
-    exists: true
-    addrs:
-    - 172.16.0.7/24
-    mtu: 1500
-
-http:
-  https://s-nxc.gsb.lan:
-    status: 200
-    allow-insecure: true
-    no-follow-redirects: false
-    timeout: 5000
-    body:
-      - Nextcloud
--- a/83
+++ b/83
@ -0,0 +1,83 @@
+# Ce fichier viminfo a été généré par Vim 9.0.
+# Vous pouvez l'éditer, mais soyez prudent.
+
+# Viminfo version
+|1,4
+
+# 'encoding' dans lequel ce fichier a été écrit
+*encoding=utf-8
+
+
+# hlsearch on (H) or off (h):
+~h
+# Historique ligne de commande (chronologie décroissante) :
+:q!
+|2,0,1703236388,,"q!"
+:x
+|2,0,1703236381,,"x"
+:x!
+|2,0,1703236221,,"x!"
+
+# Historique chaîne de recherche (chronologie décroissante) :
+
+# Historique expression (chronologie décroissante) :
+
+# Historique ligne de saisie (chronologie décroissante) :
+
+# Historique Ligne de débogage (chronologie décroissante) :
+
+# Registres :
+""1	LINE	0
+	  connection: local
+|3,1,1,1,1,0,1703236374,"  connection: local"
+"2	LINE	0
+	  hosts: localhost
+|3,0,2,1,1,0,1703236374,"  hosts: localhost"
+
+# Marques dans le fichier :
+'0  1  2  ~/tools/ansible/gsb2024/s-mon.yml
+|4,48,1,2,1703236388,"~/tools/ansible/gsb2024/s-mon.yml"
+'1  1  9  ~/tools/ansible/gsb2024/s-mon.yml
+|4,49,1,9,1703236339,"~/tools/ansible/gsb2024/s-mon.yml"
+'2  9  9  ~/tools/ansible/gsb2024/s-mon.yml
+|4,50,9,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
+'3  9  9  ~/tools/ansible/gsb2024/s-mon.yml
+|4,51,9,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
+'4  11  9  ~/tools/ansible/gsb2024/s-mon.yml
+|4,52,11,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
+'5  11  9  ~/tools/ansible/gsb2024/s-mon.yml
+|4,53,11,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
+'6  1  13  ~/tools/ansible/gsb2024/s-mon.yml
+|4,54,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
+'7  1  13  ~/tools/ansible/gsb2024/s-mon.yml
+|4,55,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
+'8  1  13  ~/tools/ansible/gsb2024/s-mon.yml
+|4,56,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
+'9  1  13  ~/tools/ansible/gsb2024/s-mon.yml
+|4,57,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
+
+# Liste de sauts (le plus récent en premier) :
+-'  1  2  ~/tools/ansible/gsb2024/s-mon.yml
+|4,39,1,2,1703236388,"~/tools/ansible/gsb2024/s-mon.yml"
+-'  1  9  ~/tools/ansible/gsb2024/s-mon.yml
+|4,39,1,9,1703236339,"~/tools/ansible/gsb2024/s-mon.yml"
+-'  9  9  ~/tools/ansible/gsb2024/s-mon.yml
+|4,39,9,9,1703236318,"~/tools/ansible/gsb2024/s-mon.yml"
+-'  11  9  ~/tools/ansible/gsb2024/s-mon.yml
+|4,39,11,9,1703236318,"~/tools/ansible/gsb2024/s-mon.yml"
+-'  11  9  ~/tools/ansible/gsb2024/s-mon.yml
+|4,39,11,9,1703236221,"~/tools/ansible/gsb2024/s-mon.yml"
+-'  1  13  ~/tools/ansible/gsb2024/s-mon.yml
+|4,39,1,13,1703236018,"~/tools/ansible/gsb2024/s-mon.yml"
+-'  1  13  ~/tools/ansible/gsb2024/s-mon.yml
+|4,39,1,13,1703236013,"~/tools/ansible/gsb2024/s-mon.yml"
+
+# Historique des marques dans les fichiers (les plus récentes en premier) :
+
+> ~/tools/ansible/gsb2024/s-mon.yml
+	*	1703236386	0
+	"	1	2
+	^	9	10
+	.	2	0
+	+	10	0
+	+	2	0
--- a/pre/Vagrantfile-s-adm
+++ b/pre/Vagrantfile-s-adm
@ -0,0 +1,77 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  config.vm.box = "debian/buster64"
+  config.vm.hostname = "s-adm"
+  config.vm.define "s-adm"
+  config.vm.provider :virtualbox do |vb|
+     vb.name = "s-adm"
+  end
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+   config.vm.network "public_network", ip: "192.168.1.91"
+   config.vm.network "private_network", ip: "192.168.99.99"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+   config.vm.provision "shell", inline: <<-SHELL
+     apt-get update
+     apt-get upgrade
+     apt-get install -y vim wget curl
+    # apt-get install -y apache2
+   SHELL
+end
--- a/pre/gsbboot
+++ b/pre/gsbboot
--- a/pre/inst-depl
+++ b/pre/inst-depl
@ -2,60 +2,52 @@
 ## aa : 2023-01-18 15:25
 ## ps : 2023-02-01 15:25
 ## ps : 2023-12-18 15:25
-## ps : 2024-01-17 15:25

 set -o errexit
 set -o pipefail
 GITUSR=gitgsb
 GITPRJ=gsb2024
 apt-get update 
-apt-get install -y lighttpd git 
+apt-get install -y apache2 git 
 STOREREP="/var/www/html/gsbstore" 
-SRC="${SRC:-http://depl.sio.lan/gsbstore}"

 GLPIREL=10.0.11
-str="wget -nc -4 https://github.com/glpi-project/glpi/releases/download/${GLPIREL}/glpi-${GLPIREL}.tgz"
+str="wget -nc https://github.com/glpi-project/glpi/releases/download/${GLPIREL}/glpi-${GLPIREL}.tgz"

 #GLPI Agent

 GLPIAGVER=1.7
-str31="wget -nc -4 https://github.com/glpi-project/glpi-agent/releases/download/${GLPIAGVER}/GLPI-Agent-${GLPIAGVER}-x64.msi"
+str31="wget -nc https://github.com/glpi-project/glpi-agent/releases/download/${GLPIAGVER}/GLPI-Agent-${GLPIAGVER}-x64.msi"

-#str32="wget -nc -4 https://github.com/glpi-project/glpi-agent/releases/download/${GLPIAGVER}/GLPI-Agent-${GLPIAGVER}-x86.msi"
+#str32="wget -nc https://github.com/glpi-project/glpi-agent/releases/download/${GLPIAGVER}/GLPI-Agent-${GLPIAGVER}-x86.msi"

 FOGREL=1.5.10
-str4="wget -nc -4 https://github.com/FOGProject/fogproject/archive/${FOGREL}.tar.gz -O fogproject-${FOGREL}.tar.gz"
+str4="wget -nc https://github.com/FOGProject/fogproject/archive/${FOGREL}.tar.gz -O fogproject-${FOGREL}.tar.gz"

 WPREL=6.4.2
 #v6.1.1 le 17/01/2023
-str5="wget -nc -4 https://fr.wordpress.org/latest-fr_FR.tar.gz -O wordpress-6.4.2-fr_FR.tar.gz"
+str5="wget -nc https://fr.wordpress.org/latest-fr_FR.tar.gz -O wordpress-6.4.2-fr_FR.tar.gz"

-str6="wget -nc -4 https://github.com/goss-org/goss/releases/latest/download/goss-linux-amd64 -O goss"
+str6="curl -L https://github.com/goss-org/goss/releases/latest/download/goss-linux-amd64 -o goss"

-str7="wget -nc -4 https://github.com/goss-org/goss/releases/latest/download/dgoss -O dgoss"
+str7="curl -L https://github.com/goss-org/goss/releases/latest/download/dgoss -o dgoss"

 #GESTSUPREL=3.2.30
-#str8="wget -nc -4 'https://gestsup.fr/index.php?page=download&channel=stable&version=${GESTSUPREL}&type=gestsup' -O gestsup_${GESTSUPREL}.zip"
-str8="wget -nc -4 'https://gestsup.fr/index.php?page=download&channel=stable&version=3.2.30&type=gestsup' -O gestsup_3.2.30.zip"
+#str8="wget -nc 'https://gestsup.fr/index.php?page=download&channel=stable&version=${GESTSUPREL}&type=gestsup' -O gestsup_${GESTSUPREL}.zip"
+str8="wget -nc 'https://gestsup.fr/index.php?page=download&channel=stable&version=3.2.30&type=gestsup' -O gestsup_3.2.30.zip"

 #METRICBEAT ET FILEBEAT
-ELKREL=8.11.4
-str81="wget -nc -4 https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${ELKREL}-amd64.deb"
-str82="wget -nc -4 https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${ELKREL}-windows-x86_64.zip"
-str83="wget -nc -4 https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-${ELKREL}-windows-x86_64.zip"
-str84="wget -nc -4 https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-${ELKREL}-amd64.deb"
+ELKREL=8.11.3
+str81="wget https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${ELKREL}-amd64.deb"
+str82="wget https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${ELKREL}-windows-x86_64.zip"
+str83="wget https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-${ELKREL}-windows-x86_64.zip"
+str84="wget https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-${ELKREL}-amd64.deb"


-[[ -d "${STOREREP}" ]] || mkdir "${STOREREP}"
+[[ -d "${STOREREP}" ]]|| mkdir "${STOREREP}"

 (cat <<EOT > "${STOREREP}/getall"
 #!/bin/bash
-if [[ -z "${SRC+x}" ]]; then
-  echo "erreur : variable SRC indefinie"
-  echo " SRC : URL serveur deploiement"
-  echo "export SRC=http://depl.sio.adm/gsbstore ; ./$0"
-  exit 1
-fi

 ${str}
 ${str31}
@ -66,55 +58,20 @@ ${str7}

 chmod +x ./goss ./dgoss

-wget -nc -4 https://get.docker.com -O getdocker.sh 
+curl -L https://get.docker.com -o getdocker.sh
 chmod +x ./getdocker.sh

-wget -nc -4 https://github.com/FiloSottile/mkcert/releases/download/v1.4.4/mkcert-v1.4.4-linux-amd64 -O mkcert
+wget -nc https://github.com/FiloSottile/mkcert/releases/download/v1.4.4/mkcert-v1.4.4-linux-amd64 -O mkcert
 chmod +x ./mkcert

-#${str8}
+${str8}

 ${str81} 
 ${str82} 
 ${str83} 
 ${str84} 
-wget -nc -4 "${SRC}/zabbix.sql.gz" -O zabbix.sql.gz

 EOT
 )

 cat "${STOREREP}/getall"
-
-cd "${STOREREP}" || exit 2
-bash getall
-cp goss /usr/local/bin
-
-(cat <<'EOT' > "${STOREREP}/inst1"
-#!/bin/bash
-if [[ -z "${HOST+x}" ]]; then
-  echo "erreur : variable HOST indefinie"
-  echo " HOST : adresse serveur deploiement"
-  echo "export HOST=s-xyzt ; ./$0"
-  exit 1
-fi
-
-hostname=$(hostname)
-echo "${HOST}" > /etc/hostname
-hostnamectl set-hostname "${HOST}"
-sed -i "s/${hostname}/${HOST}/g" /etc/hosts
-echo "vous pouvez redemarrer ..."
-EOT
-)
-
-(cat <<'EOT' > "${STOREREP}/inst2"
-#!/bin/bash
-
-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
-EOT
-)
-
-
--- a/pre/inst-depl.old
+++ b/pre/inst-depl.old
@ -0,0 +1,48 @@
+#!/bin/bash
+set -o errexit
+set -o pipefail
+GITUSR=gitgsb
+GITPRJ=gsb
+apt update && apt upgrade
+apt install -y apache2 git 
+getent passwd "${GITUSR}" >> /dev/null
+if [[ $? != 0 ]]; then
+  echo "creation utilisateur "${GITUSR}" ..."
+  /sbin/useradd -m -d /home/"${GITUSR}" -s /bin/bash "${GITUSR}" 
+  echo "${GITUSR}:${GITUSR}" | /sbin/chpasswd 
+else
+  echo "utilisateur "${GITUSR}" existant..."
+fi
+su -c "git init --share --bare /home/${GITUSR}/${GITPRJ}.git" "${GITUSR}"
+su -c "cd ${GITPRJ}.git/.git/hooks && mv post-update.sample post-update" "${GITUSR}"
+[[ -h /var/www/html/"${GITPRJ}".git ]]|| ln -s /home/"${GITUSR}"/"${GITPRJ}".git /var/www/html/"${GITPRJ}".git
+[[ -d /var/www/html/gsbstore ]]|| mkdir /var/www/html/gsbstore
+ 
+(cat <<EOT > /var/www/html/gsbstore/getall
+
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+
+GLPIREL=9.4.5
+wget -nc https://github.com/glpi-project/glpi/releases/download/\${GLPIREL}/glpi-\${GLPIREL}.tgz
+ 
+FIREL=9.4+2.4
+wget -nc -O fusioninventory-glpi\${FIREL}.tag.gz https://github.com/fusioninventory/fusioninventory-for-glpi/archive/glpi\${FIREL}.tar.gz 
+#https://github.com/fusioninventory/fusioninventory-for-glpi/archive/glpi9.4+2.4.tar.g 
+ 
+FIAGREL=2.5.2 
+wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/\${FIAGREL}/fusioninventory-agent_windows-x64_\${FIAGREL}.exe
+ 
+wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/\$FIAGREL/fusioninventory-agent_windows-x86_\${FIAGREL}.exe
+ 
+FOGREL=1.5.7
+wget -nc https://github.com/FOGProject/fogproject/archive/\${FOGREL}.tar.gz -O fogproject-\${FOGREL}.tar.gz
+ 
+wget -nc https://fr.wordpress.org/wordpress-5.3.2-fr_FR.tar.gz
+
+EOT
+)
+cat /var/www/html/gsbstore/getall
+
--- a/pre/pull-config
+++ b/pre/pull-config
@ -14,15 +14,15 @@ dir=/root/tools/ansible

 cd  "${dir}" || exit 1

+hostname  > hosts
 if [[ $# == 1 ]] ; then
 	opt=$1
 fi
 if [[ "${opt}" == '-l'  ]] ; then
-	cd "${dir}/${prj}" || exit 2
-	echo "Execution locale ...."
-	ansible-playbook -i localhost, -c local  "$(hostname).yml"
+   cd "${dir}/${prj}" || exit 2	
+   ansible-playbook -i localhost, -c local  "$(hostname).yml"
 else
-	ansible-pull -i "$(hostname)," -U "${UREP}"
+   ansible-pull -i "${dir}/hosts"  -C main -U "${UREP}"
 fi

 exit 0
--- a/18
+++ b/18
@ -1,11 +1,7 @@
 #!/bin/bash

-dir=/root/tools/ansible
-prj=gsb2024
-opt=""
-
 if [ -z ${UREP+x} ]; then 
-	UREP=https://gitea.lyc-lecastel.fr/gsb/gsb2024.git
+	UREP=https://gitea.lyc-lecastel.fr/gsb/gsb2024.git 
 fi

 dir=/root/tools/ansible
@ -14,15 +10,7 @@ dir=/root/tools/ansible

 cd  "${dir}" || exit 1

-if [[ $# == 1 ]] ; then
-	opt=$1
-fi
-if [[ "${opt}" == '-l'  ]] ; then
-	cd "${dir}/${prj}" || exit 2
-	echo "Execution locale ...."
-	ansible-playbook -i localhost, -c local  "$(hostname).yml"
-else
-	ansible-pull -i "$(hostname)," -U "${UREP}"
-fi
+hostname  > hosts
+ansible-pull -i "${dir}/hosts"  -C main -U "${UREP}"

 exit 0
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@ -1,14 +1,8 @@
 ---

- name: desactive unatentted upgrade
-  ansible.builtin.service:
-    name: unattended-upgrades.service
-    state: stopped
-    enabled: false
-
 - name: Copie sources.list
  copy:
-    src: sources.list.{{ ansible_distribution_release }}
+    src: sources.list.{{ ansible_distribution }}
    dest: /etc/apt/sources.list

 - name: Copie apt.conf pour proxy 
@ -81,3 +75,8 @@
    - net.ipv6.conf.default.disable_ipv6
    - net.ipv6.conf.lo.disable_ipv6

+- name: desactive unatentted upgrade
+  ansible.builtin.service:
+    name: unattended-upgrades.service
+    state: stopped
+    enabled: false
--- a/roles/base/templates/hosts.j2
+++ b/roles/base/templates/hosts.j2
@ -22,9 +22,6 @@
 192.168.99.14	s-nas.gsb.adm
 192.168.99.15	s-san.gsb.adm
 192.168.99.16	s-fog.gsb.adm
-192.168.99.20	s-kea1.gsb.adm
-192.168.99.21	s-kea2.gsb.adm
-192.168.99.22	s-awx.gsb.adm
 192.168.99.50	s-lb-bd.gsb.adm
 192.168.99.101	s-lb-web1.gsb.adm
 192.168.99.102	s-lb-web2.gsb.adm
--- a/roles/base/templates/hosts.s-proxy.j2
+++ b/roles/base/templates/hosts.s-proxy.j2
@ -21,9 +21,6 @@
 192.168.99.12	r-int.gsb.adm
 192.168.99.13	r-ext.gsb.adm
 192.168.99.14	s-nas.gsb.adm
-192.168.99.20	s-kea1.gsb.adm
-192.168.99.21	s-kea2.gsb.adm
-192.168.99.22	s-awx.gsb.adm
 192.168.99.50	s-lb-bd.gsb.adm
 192.168.99.101	s-lb-web1.gsb.adm
 192.168.99.102	s-lb-web2.gsb.adm
--- a/roles/dhcp/files/dhcpd.conf
+++ b/roles/dhcp/files/dhcpd.conf
@ -120,7 +120,7 @@ subnet 172.16.65.0 netmask 255.255.255.0 {
 #DHCP pour le réseau USER

 subnet 172.16.64.0 netmask 255.255.255.0 {
-        range 172.16.64.100 172.16.64.150;
+        range 172.16.64.20 172.16.64.120;
        option domain-name-servers 172.16.0.1 ;
        option routers 172.16.64.254;
        option broadcast-address 172.16.64.255;
--- a/roles/dns-master/files/db.gsb.lan
+++ b/roles/dns-master/files/db.gsb.lan
@ -5,7 +5,7 @@
 ;
 $TTL    604800
@       IN      SOA     s-infra.gsb.lan. root.s-infra.gsb.lan. (
-                        2024011900      ; Serial
+                        2023051000      ; Serial
                        7200	        ; Refresh
                        86400           ; Retry
                        8419200         ; Expire
@ -16,11 +16,9 @@ $TTL    604800
@      	        IN      A       127.0.0.1
@       	IN      AAAA    ::1
 s-infra  	IN      A       172.16.0.1
+s-backup        IN      A	172.16.0.4
 s-proxy         IN      A       172.16.0.2
 s-appli    	IN      A       172.16.0.3
-s-backup        IN      A	172.16.0.4
-s-stork         IN      A	172.16.0.4
-s-gotify        IN      A	172.16.0.4
 s-win    	IN      A       172.16.0.6
 s-mess   	IN      A       172.16.0.7
 s-nxc		IN	A	172.16.0.7
@ -29,9 +27,6 @@ s-mon    	IN      A       172.16.0.8
 s-itil		IN	A	172.16.0.9
 s-elk		IN	A	172.16.0.11
 s-gestsup	IN	A	172.16.0.17
-s-kea1		IN	A	172.16.0.20
-s-kea2		IN	A	172.16.0.21
-s-awx		IN	A	172.16.0.22
 r-int    	IN      A       172.16.0.254
 r-int-lnk    	IN      A       192.168.200.254
 r-ext  		IN      A       192.168.200.253
--- a/roles/dns-master/files/db.gsb.lan.rev
+++ b/roles/dns-master/files/db.gsb.lan.rev
@ -5,7 +5,7 @@
 ;
 $TTL    604800
@       IN      SOA     s-infra.gsb.lan. root.s-infra.gsb.lan. (
-                        2024011800      ; Serial
+                        2023040501      ; Serial
                        7200            ; Refresh
                        86400           ; Retry
                        8419200         ; Expire
@ -21,13 +21,10 @@ $TTL    604800
 7.0       IN      PTR     s-nxc.gsb.lan.
 8.0       IN      PTR     s-mon.gsb.lan.
 9.0	  IN	  PTR	  s-itil.gsb.lan.
-20.0	  IN	  PTR	  s-kea1.gsb.lan.
-21.0	  IN	  PTR	  s-kea2.gsb.lan.
-22.0	  IN	  PTR	  s-awx.gsb.lan.
 101.1     IN      PTR     s-web1
 101.2     IN      PTR     s-web2
 100.10   IN      PTR      s-lb
 100.10   IN      PTR      s-lb.gsb.lan
 11.0	  IN	  PTR	  s-elk.gsb.lan.
 17.0	  IN	  PTR	  s-gestsup.lan
-254.0     IN      PTR     r-int.gsb.lan.
+254.0     IN      PTR     r-int.gsb.lan.
--- a/roles/docker/tasks/glpi-10.0.11.tgz
+++ b/roles/docker/tasks/glpi-10.0.11.tgz
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@ -1,16 +1,16 @@
 ---
- name: on recupere getdocker
-  get_url:
-    url: http://s-adm.gsb.adm/gsbstore/getdocker.sh
-    dest: /usr/local/bin
+- name: Supprime le fichier getdocker.sh si déjà présent
+  file:
+    state: absent
+    path: /tmp/getdocker.sh

- name: on verifie si docker est installe
-  stat:
-    path: /usr/bin/docker
-  #command: which docker
-  register: docker_present
+- 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 si docker n'est pas deja installe
-  shell: bash /usr/local/bin/getdocker.sh
-  #when: docker_present.stdout.find('/usr/bin/docker') == -1
-  when: not docker_present.stat.exists
+- name: Execution du script getdocker
+  shell: bash /tmp/getdocker.sh
--- a/roles/elk-filebeat-cli/defaults/main.yml
+++ b/roles/elk-filebeat-cli/defaults/main.yml
@ -1 +1 @@
-BEATVER: "8.11.4"
+BEATVER: "8.11.5"
--- a/roles/elk-filebeat-cli/tasks/main.yml
+++ b/roles/elk-filebeat-cli/tasks/main.yml
@ -8,11 +8,6 @@
  apt:
    deb: /tmp/filebeat-${BEATVEAR}-amd64.deb

- name: sorie pou debug
-  fail:
-    msg: "packet installe"
-
-
 - name: Changement du fichier de conf
  copy:
    src: filebeat.yml
--- a/roles/elk/README.md
+++ b/roles/elk/README.md
@ -1,22 +1,9 @@
-# Le rôle elk
-ELK Version 8.5.3
+## Principe du rôle elk
+ELK 8.5.3

-
-Ce rôle a pour but d'installer un serveur ELK pour centraliser les logs et les métriques pour simplifier la gestion du parc informatique GSB. 
-
-
-Le rôle **elk** installe **docker**, les différentes tâches de ce rôle sont de :
+Ce rôle permet de créer un serveur ELK pour centraliser les logs et de des métriques pour simplifier la gestion du parc informatique GSB. 
+Le principe de ce rôle est d'installer docker, les différentes tâches de ce rôle sont de :
 - Vérifier si ELK est déjà installé,
- clonage du depot **devianthony** depuis github,
- Changement de la configuration pour passer en version 'basic'
+- Importation un docker-compose depuis github,
+- Changement la configuration pour passer en version 'basic'
 - Lancement d'ELK avec docker-compose
-
-## Lancement manuel
- depuis le répertoire **nxc** :
-````shell
-docker compose up setup
-docker compose up -d
-````
-
-
-
--- a/roles/elk/tasks/main.yml
+++ b/roles/elk/tasks/main.yml
@ -21,7 +21,7 @@
      regexp: 'xpack.license.self_generated.type: trial'
      replace: 'xpack.license.self_generated.type: basic'
     
-        #  - name: Execution du fichier docker-compose.yml
-        #    shell: docker compose pull
-        #    args:
-        #      chdir: /root/elk
+  - name: Execution du fichier docker-compose.yml
+    shell: docker compose up -d
+    args:
+      chdir: /root/elk
--- a/roles/fog/README.md
+++ b/roles/fog/README.md
@ -1,41 +1,16 @@
 # Fog

-Ce rôle permet **l'installation** et la **configuration** de **Fog**.
+Ce rôle permet l'installation et la modification de Fog.

-**Fog** est une solution open-source de gestion de parc informatique. Il offre des fonctionnalités telles que la **création d'images système**, le **déploiement d'images sur plusieurs machines** et la **gestion des postes de travail** grâce à **PXE**.

-**PXE** (Preboot eXecution Environment) est un protocole qui permet à un hôte de démarrer via le réseau, plutôt que depuis son disque dur local. Cela facilite le déploiement d'images système à distance.
- 
-Dans le contexte de GSB, Fog avec PXE,assure le service **DHCP**.
+## Fog, c'est quoi ?

-Ainsi, Fog simplifie le processus de création  d'images et du déployement de postes en gérant à la fois le démarrage réseau (PXE) et la configuration réseau (DHCP).

-## Comment l'installer et le configurer ?
+Fog permet le déploiement d'images disque tel que Windows ou bien Linux en utilisant PXE (Preboot Execution Environment).

-### Prérequis:

-Mettre au moins 4GB de mémoire.
+## Comment l'installer ?

-### Etape 1:

-Lancez le PlayBook Ansible de "pré-installation" nommé **s-fog.yml**.
-
-Il installe la base de **Fog** , l'outil **Goss** , configure le **DHCP** , **SSH** et l'agent **SSH**.
-
-Ce PlayBook fait aussi appel au PlayBook **main.yml** qui se trouve dans **roles/fog/tasks/** qui installe les paquets de base comme **Apache2** , **MariaDb client et serveur** ... (Voir en détail le PlayBook). 
-
-Enfin ce PlayBook permet aussi de récupérer l'archive d'installation de Fog depuis le serveur **s-admin** (grâce au PlayBook **main.yml** dans **roles/default/**), puis décompresse cette archive et l'exécute (à partir du moment où on lance le deuxieme PlayBook : voir l'étape 2).
-
-Redémarrer le serveur pour que les interfaces puissent avoir les bonnes adresses IP.
-
-### Etape 2:
-
-Lancez le second PlayBook **install-fog.yml** qui permet de faire appel aux tâches qui exécute le script d'installation **fogsettings** qui permet d'éviter de répondre aux différentes questions manuellement.
-
-### Etape 3:
-
-Il n'y a plus qu'à se rendre sur l'interface en ligne de Fog avec l'URL suivant : **http://172.16.64.16/management/** à partir d'un poste étant dans le bon réseau et suivre les consignes indiquées (Installation ou mise à jour de la base de données) et vous pourrez ainsi vous y connecter et commencer à l'utiliser.
-
-### Etape supplémentaire:
-
-Vous pouvez tester que la configuration est correcte avec Goss (commande : **./agoss -f tap** ) à partir du répertoire **gsb2024**.
+Avant toute chose, lancer le fichier goss de s-fog ( présent dans gsb2023/goss/s-fog.yaml ) pour vérifier que la configuration réseau est correct et opérationnel. Une fois l'installation principale effectuée, il faut lancer le playbook ansible s-fog.yaml.
+Il faudra se rendre dans le dossier **fog** pour lancer le script **installfog.sh** ( fog/bin/ ). La configuration sera déjà établie via le fichier **.fogsettings**
--- a/roles/fog/defaults/main.yml
+++ b/roles/fog/defaults/main.yml
@ -1,3 +1,3 @@
 depl_url: "http://s-adm.gsb.adm/gsbstore"
-depl_fog: "fogproject-1.5.10.tar.gz"
+depl_fog: "fogproject-1.5.9.tar.gz"
 instructions: "Pour lancer l'installateur Fog, faites : 'bash /root/tools/fog/bin/installfog.sh'. Suivez ensuite les instructions" 
--- a/roles/fog/files/.fogsettings.single-if
+++ b/roles/fog/files/.fogsettings.single-if
@ -1,46 +0,0 @@
-## Start of FOG Settings
-## Created by the FOG Installer
-## Find more information about this file in the FOG Project wiki:
-##     https://wiki.fogproject.org/wiki/index.php?title=.fogsettings
-## Version: 1.5.10
-## Install time: mar. 16 janv. 2024 15:27:57
-ipaddress='192.168.99.100'
-copybackold='0'
-interface='enp0s3'
-submask='255.255.255.0'
-hostname='s-fog.gsb.lan'
-routeraddress='192.168.99.99'
-plainrouter='192.168.99.99'
-dnsaddress='192.168.99.99'
-username='fogproject'
-password='zbSw#FaGPS7O1bJ5tpfj'
-osid='2'
-osname='Debian'
-dodhcp='Y'
-bldhcp='0'
-dhcpd='isc-dhcp-server'
-blexports='1'
-installtype='N'
-snmysqluser='fogmaster'
-snmysqlpass='cbZjO*gCONbbldV4a6l1'
-snmysqlhost='localhost'
-mysqldbname='fog'
-installlang='0'
-storageLocation='/images'
-fogupdateloaded=1
-docroot='/var/www/html/'
-webroot='/fog/'
-caCreated='yes'
-httpproto='http'
-startrange=''
-endrange=''
-packages='apache2 bc build-essential cpp curl g++ gawk gcc genisoimage git gzip htmldoc isolinux lftp libapache2-mod-php libc6 libcurl4 liblzma-dev m4 mariadb-client mariadb-server net-tools nfs-kernel-server openssh-server php php-bcmath php-cli php-curl php-fpm php-gd php-json php-ldap php-mbstring php-mysql tar tftpd-hpa tftp-hpa unzip vsftpd wget zlib1g'
-noTftpBuild=''
-tftpAdvOpts=''
-sslpath='/opt/fog/snapins/ssl/'
-backupPath='/home/'
-armsupport=''
-php_ver='7.4'
-sslprivkey='/opt/fog/snapins/ssl//.srvprivate.key'
-sendreports='Y'
-## End of FOG Settings
--- a/roles/fog/files/fogsettings
+++ b/roles/fog/files/fogsettings
@ -2,18 +2,18 @@
 ## Created by the FOG Installer
 ## Find more information about this file in the FOG Project wiki:
 ##     https://wiki.fogproject.org/wiki/index.php?title=.fogsettings
-## Version: 1.5.10
-## Install time: Mon Jan 15 23:16:31 2024
-ipaddress='172.16.0.16'
+## Version: 1.5.9
+## Install time: jeu. 26 janv. 2023 11:41:05
+ipaddress='172.16.64.16'
 copybackold='0'
 interface='enp0s9'
 submask='255.255.255.0'
-hostname='s-fog'
-routeraddress='172.16.64.254'
-plainrouter='172.16.64.254'
+hostname='s-fog.gsb.lan'
+routeraddress='192.168.99.99'
+plainrouter='192.168.99.99'
 dnsaddress='172.16.0.1'
 username='fogproject'
-password='0lEyBKxcrQxseHLB#Cbg'
+password='/7ElC1OHrP47EN2w59xl'
 osid='2'
 osname='Debian'
 dodhcp='y'
@ -22,27 +22,25 @@ dhcpd='isc-dhcp-server'
 blexports='1'
 installtype='N'
 snmysqluser='fogmaster'
-snmysqlpass='DQG@4PU31F9vOE4bX6V2'
+snmysqlpass='HHO5vSGqFiHE_9d2lja3'
 snmysqlhost='localhost'
 mysqldbname='fog'
-installlang='1'
+installlang='0'
 storageLocation='/images'
 fogupdateloaded=1
 docroot='/var/www/html/'
 webroot='/fog/'
 caCreated='yes'
-httpproto='https'
-startrange='172.16.64.120'
-endrange='172.16.64.140'
+httpproto='http'
+startrange='172.16.64.10'
+endrange='172.16.64.254'
 bootfilename='undionly.kpxe'
-packages='apache2 bc build-essential cpp curl g++ gawk gcc genisoimage gettext git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-php libc6 libcurl4 liblzma-dev m4 mariadb-client mariadb-server net-tools nfs-kernel-server openssh-server php php-bcmath php-cli php-curl php-fpm php-gd php-intl php-json php-ldap php-mbstring php-mysql tar tftp-hpa tftpd-hpa unzip vsftpd wget zlib1g'
+packages='apache2 bc build-essential cpp curl g++ gawk gcc genisoimage git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-php7.4 libc6 libcurl4 li>
 noTftpBuild=''
-tftpAdvOpts=''
 sslpath='/opt/fog/snapins/ssl/'
-#backupPath='/home/'
+backupPath='/home/'
 armsupport='0'
 php_ver='7.4'
+php_verAdds='-7.4'
 sslprivkey='/opt/fog/snapins/ssl//.srvprivate.key'
-sendreports='N'
 ## End of FOG Settings
-
--- a/roles/fog/files/fogsettings.old
+++ b/roles/fog/files/fogsettings.old
@ -1,49 +0,0 @@
-## Start of FOG Settings
-## Created by the FOG Installer
-## Find more information about this file in the FOG Project wiki:
-##     https://wiki.fogproject.org/wiki/index.php?title=.fogsettings
-## Version: 1.5.10
-## Install time: jeu. 11 janv. 2024
-## Install time: jeu. 11 janv. 2024 11:41:05
-ipaddress='172.16.64.16'
-copybackold='0'
-interface='enp0s9'
-submask='255.255.255.0'
-hostname='s-fog.gsb.lan'
-routeraddress='172.16.64.254'
-plainrouter='172.16.64.254'
-dnsaddress='172.16.0.1'
-username='fogproject'
-password='/7ElC1OHrP47EN2w59xl'
-osid='2'
-osname='Debian'
-dodhcp='y'
-bldhcp='1'
-dhcpd='isc-dhcp-server'
-blexports='1'
-installtype='N'
-snmysqluser='fogmaster'
-snmysqlpass='HHO5vSGqFiHE_9d2lja3'
-snmysqlhost='localhost'
-mysqldbname='fog'
-installlang='1'
-storageLocation='/images'
-fogupdateloaded=1
-docroot='/var/www/'
-webroot='/fog/'
-caCreated='yes'
-httpproto='https'
-startrange='172.16.64.10'
-endrange='172.16.64.254'
-#bootfilename='undionly.kpxe'
-packages='apache2 bc build-essential cpp curl g++ gawk gcc genisoimage gettext git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-php libc6 libcurl4 liblzma-dev m4 mariadb-client mariadb-server net-tools nfs-kernel-server openssh-server php php-bcmath php-cli php-curl php-fpm php-gd php-intl php-json php-ldap php-mbstring php-mysql tar tftpd-hpa tftp-hpa unzip vsftpd wget zlib1g'
-noTftpBuild=''
-tftpAdvOpts=''
-sslpath='/opt/fog/snapins/ssl/'
-backupPath='/home/'
-armsupport='0'
-php_ver='7.4'
-#php_verAdds='-7.4'
-sslprivkey='/opt/fog/snapins/ssl//.srvprivate.key'
-sendreports='Y'
-## End of FOG Settings
--- a/roles/fog/files/fogsettings1
+++ b/roles/fog/files/fogsettings1
@ -1,51 +0,0 @@
-## Start of FOG Settings
-## Created by the FOG Installer
-## Find more information about this file in the FOG Project wiki:
-##     https://wiki.fogproject.org/wiki/index.php?title=.fogsettings
-## Version: 1.5.10
-## Install time: Mon Jan 15 23:16:31 2024
-ipaddress='192.168.56.10'
-copybackold='0'
-interface='eth2'
-submask='255.255.255.0'
-hostname='fog'
-routeraddress='192.168.1.1'
-plainrouter='192.168.1.1'
-dnsaddress='192.168.1.1'
-username='fogproject'
-password='0lEyBKxcrQxseHLB#Cbg'
-osid='2'
-osname='Debian'
-dodhcp='y'
-bldhcp='1'
-dhcpd='isc-dhcp-server'
-blexports='1'
-installtype='N'
-snmysqluser='fogmaster'
-snmysqlpass='DQG@4PU31F9vOE4bX6V2'
-snmysqlhost='localhost'
-mysqldbname='fog'
-installlang='1'
-storageLocation='/images'
-fogupdateloaded=1
-docroot='/var/www/html/'
-webroot='/fog/'
-caCreated='yes'
-httpproto='https'
-startrange='192.168.56.10'
-endrange='192.168.56.254'
-packages='apache2 bc build-essential cpp curl g++ gawk gcc genisoimage gettext git gzip htmldoc i
-sc-dhcp-server isolinux lftp libapache2-mod-php libc6 libcurl4 liblzma-dev m4 mariadb-client mari
-adb-server net-tools nfs-kernel-server openssh-server php php-bcmath php-cli php-curl php-fpm php
-gd php-intl php-json php-ldap php-mbstring php-mysql tar tftp-hpa tftpd-hpa unzip vsftpd wget zl
-ib1g '
-noTftpBuild=''
-tftpAdvOpts=''
-sslpath='/opt/fog/snapins/ssl/'
-backupPath='/home/'
-armsupport='0'
-php_ver='7.4'
-sslprivkey='/opt/fog/snapins/ssl//.srvprivate.key'
-sendreports='N'
-## End of FOG Settings
-
--- a/roles/fog/tasks/main.yml
+++ b/roles/fog/tasks/main.yml
@ -1,54 +1,26 @@
 ---
- name: Installation des paquets de base
-  apt:
-    state: present
-    name:
-    - apache2 
-    - curl  
-    - git 
-    - gzip  
-    - isc-dhcp-server 
-    - mariadb-client 
-    - mariadb-server 
-    - net-tools 
-    - openssh-server 
-    - php
-    - php-cli 
-    - php-curl 
-    - php-fpm 
-    - php-gd 
-    - php-intl 
-    - php-json 
-    - php-ldap 
-    - php-mbstring 
-    - php-mysql
-    - tar 
-    - unzip 
-    - vsftpd 
-    - wget 
-
- name: creation /root/tmp
+- name: creation d'un repertoire fog
  file:
-    path: /root/tmp
+    path: /root/tools/fog
    state: directory

+- name: recuperation de l'archive d'installation fog sur git
+  git:
+    repo: https://gitea.lyc-lecastel.fr/gadmin/fog.git
+    dest: /root/tools/fog/
+    clone: yes
+    update: yes
+
+- name: Modification fichier bash (desac UDPCast)
+  ansible.builtin.lineinfile:
+    path: /root/tools/fog/lib/common/functions.sh
+    regexp: '^configureUDPCast\(\).*'
+    line: "configureUDPCast() {\nreturn"
+    backup: yes
+
 - name: fichier config fogsettings
-  copy:
-    src: fogsettings
-    dest: /root/tmp/
+  command: "cp /root/tools/ansible/roles/fog/files/fogsettings /opt/fog/"

- name: Récupération archive d'installation Fog
-  get_url:
-    url: "{{ depl_url }}/{{ depl_fog }}"
-    dest: "/root/tmp/"
-
- name: Décompression de l'archive
-  ansible.builtin.unarchive:
-    src: "/root/tmp/{{ depl_fog }}"
-    dest: "/root/tmp/"
-
- name: Exécution du script d'installation Fog
-  ansible.builtin.shell: sudo bash /root/tmp/fogproject-1.5.10/bin/installfog.sh --recreate-keys -f /root/tmp/fogsettings -y
-  args:
-    chdir: "/root/tmp/fogproject-1.5.10/"
+- name: fichier fogsettings en .fogsettings
+  command: "mv /opt/fog/fogsettings /opt/fog/.fogsettings"

--- a/roles/fw-ferm/README.md
+++ b/roles/fw-ferm/README.md
@ -1,76 +1,6 @@
-Configuration de ferm
-
 # [Ferm](http://ferm.foo-projects.org/)

-Modifier l'execution d'iptables [plus d'info ici#!/bin/bash
-set -u
-set -e
-# Version Site to Site 
- 
-AddressAwg=10.0.0.1/32  # Adresse VPN Wireguard cote A
-EndpointA=192.168.0.51  # Adresse extremite A
-PortA=51820  # Port ecoute extremite A
-NetworkA=192.168.1.0/24 # reseau cote A
-NetworkC=192.168.200.0/24 #reseau cote A
-NetworkD=172.16.0.0/24 #reseau cote A
-
-AddressBwg=10.0.0.2/32  # Adresse VPN Wireguard cote B
-EndpointB=192.168.0.52 # Adresse extremite B
-PortB=51820  # Port ecoute extremite B
-NetworkB=172.16.128.0/24 # reseau cote B
- 
-umask 077
-wg genkey > endpoint-a.key
-wg pubkey < endpoint-a.key > endpoint-a.pub
- 
-wg genkey > endpoint-b.key
-wg pubkey < endpoint-b.key > endpoint-b.pub
- 
- 
-PKA=$(cat endpoint-a.key)
-pKA=$(cat endpoint-a.pub)
-PKB=$(cat endpoint-b.key)
-pKB=$(cat endpoint-b.pub)
- 
-cat <<FINI > wg0-a.conf
-# local settings for Endpoint A
-[Interface]
-PrivateKey = $PKA
-Address = $AddressAwg
-ListenPort = $PortA
- 
-# IP forwarding
-PreUp = sysctl -w net.ipv4.ip_forward=1
- 
-# remote settings for Endpoint B
-[Peer]
-PublicKey = $pKB
-Endpoint = ${EndpointB}:$PortB
-AllowedIPs = $AddressBwg, $NetworkB
- 
-FINI
- 
- 
-cat <<FINI > wg0-b.conf
-# local settings for Endpoint B
-[Interface]
-PrivateKey = $PKB
-Address = $AddressBwg
-ListenPort = $PortB
- 
-# IP forwarding
-PreUp = sysctl -w net.ipv4.ip_forward=1
- 
-# remote settings for Endpoint A
-[Peer]
-PublicKey = $pKA
-Endpoint = ${EndpointA}:$PortA
-AllowedIPs = $AddressAwg, $NetworkA, $NetworkC, $NetworkD
- 
-FINI
- 
-echo "wg0-a.conf et wg0-b.conf sont generes ..."
-echo "copier wg0-b.conf sur la machine b et renommer les fichiers de configuration ..."](https://wiki.debian.org/iptables)
+Modifier l'execution d'iptables [plus d'info ici](https://wiki.debian.org/iptables)
 ```shell
 update-alternatives --set iptables /usr/sbin/iptables-legacy
 ```
--- a/roles/fw-ferm/files/ferm.conf.r-vp1
+++ b/roles/fw-ferm/files/ferm.conf.r-vp1
@ -4,6 +4,7 @@

@def $DEV_PRIVATE = enp0s8;
@def $DEV_WORLD = enp0s9;
+@def $DEV_WORLD = enp0s9;
@def $DEV_VPN= wg0;
@def $NET_PRIVATE = 172.16.0.0/24;

@ -31,7 +32,7 @@ table filter {
        # well-known internet hosts
        saddr ($NET_PRIVATE) proto tcp dport ssh ACCEPT;

-        # we provide DNS services for the internal net
+        # we provide DNS and SMTP services for the internal net
        interface $DEV_PRIVATE saddr $NET_PRIVATE {
            proto (udp tcp) dport domain ACCEPT;
            proto udp dport bootps ACCEPT;
--- a/roles/fw-ferm/files/ferm.conf.r-vp2
+++ b/roles/fw-ferm/files/ferm.conf.r-vp2
@ -29,7 +29,7 @@ table filter {
        # well-known internet hosts
        saddr ($NET_PRIVATE) proto tcp dport ssh ACCEPT;

-        # we provide DNS services for the internal net
+        # we provide DNS and SMTP services for the internal net
        interface $DEV_PRIVATE saddr $NET_PRIVATE {
            proto (udp tcp) dport domain ACCEPT;
            proto udp dport bootps ACCEPT;
--- a/roles/glpi/README.md
+++ b/roles/glpi/README.md
@ -1,93 +1,44 @@
-## Comment fonctionne le rôle
+## Comment marche le rôle
  
 Le rôle installe un serveur GLPI fonctionnant graĉe à php et à nginx.  
-Ce rôle permet aussi de télécharger l'agent GLPI sur glpi.  
-Le rôle permet de créer la base GLPI.  
+Ce rôle permet aussi d'installer FusionInventory sur glpi.  
+Le rôle permet aussi de sauvegarde la BDD de glpi.  

 ## Comment utiliser GLPI
  
-Après le pull-config, depuis une machine du réseau n-user, se rendre sur l'URL : *http://s-itil.gsb.lan*  
-Puis lancer l'installation, les paramètres sql à fournir sont les suivant :  
-* serveur : **localhost**  
-* utilisateur : **glpi**  
-* mot de passe : **glpi**  
-* Selectionner la base **glpi**  
-
+Après le pull-config, aller sur une machine du réseau n-user et aller sur http://s-itil/install/install.php  
+Puis lancer l'installation, les paramètres sql à fournir sont :  
+serveur : localhost  
+utilisateur : glpi  
+mot de passe : glpi  
+Selectionner la base glpi  
 Ne pas envoyer de statistique d'usage  

  
 ## Postfix :
-
-Postfix est utilisé pour renvoyer des messages pour assuré le suivi de l'avancement du ticket. 
  
-Aller dans **Configuration > Notification**, activer le suivi et les notification   
+Aller dans Configuration > Notification, activer le suivi et les notification   
 Aller dans Configuration des notifications par courriels  
 Mettre l'adresse mail de supervision dans : Courriel de l'administrateur, Courriel expéditeur et comme adresse de réponse  
 Le mode d'envoie des courriels est SMTP  
 l'hôte SMTP est localhost
-
-## Inventorier une machine windows sur le serveur GLPI avec l'agent : 
-Actuellement la version de l'agent glpi disponible directement sur le serveur est la version 1.7 de celui.
- * Télécharger l'agent depuis le serveur GLPI : *http://s-itil/glpicli*
- * Installer l'agent : sélectionner l'option "Typical" et entrer l'URL du serveur dans "Remote Targets" : *http://s-itil/*
- * Se rendre sur localhost:62354 pour forcer la remonter
-
-*Note: si la machine ne remonte aprés avoir forcer l'interface depuis l'interface web il est possible de rédémarrer le service glpi agent.*
- * Actualiser GLPI et la machine sera inventoriée
-
-## Enregistrements A et PTR pour S-WIN :
-
-Les enregistrements "A" et "PTR" sont utilisés pour résoudre les noms des machines nécessaire à la synchronisation de l'annuaire LDAP sur le serveur comme serveur DNS GLPI en utilisant le serveur S-WIN sans passé sur le serveur S-INFRA. 
-
-Ajouter les enregistrement "A" et "PTR" sur le DNS de l'Active Directory:
-Sur le serveur S-WIN:
-
-**Gestionnaire de serveur** --> **Gestionnaire DNS** --> **Zones Recherches Directes** --> **gsb.lan** --> **Ajouter un hôte (A)**:
-   * s-infra         172.16.0.1
-   * s-itil          172.16.0.9
-   * r-int           172.16.0.254
-   * s-win           172.16.0.6
-
-Cocher la case **Créer un pointeur d'enregistrement PTR associé**   
-
-
 ## LDAP :
  
 Aller dans Configuration > Authentification > Annuaires LDAP.   
 Ajouter un serveur en cliquant sur le +  
 Remplisser les cases:   
-* Nom : **s-win**  
-* Serveur par défaut : **oui**
-* Actif : **oui**  
-* Serveur : **s-win.gsb.lan**  
-* Filtre de connexion : (&(objectClass=user)(objectCategory=person)(!(userAccountControl:1.2.840.113556.1.4.803:=2)))  
-* BaseDN : **DC=gsb,DC=lan**  
-* DN du compte : **GSB\Administrateur**  
-* Mot de passe : **Azerty1+**  
-* Champ de l'identifiant : **samaccountname**  
+Nom : s-win  
+Serveur par défaut : oui  
+Actif : oui  
+Serveur : s-win.gsb.lan  
+Filtre de connexion : (&(objectClass=user)(objectCategory=person)(!(userAccountControl:1.2.840.113556.1.4.803:=2)))  
+BaseDN : DC=gsb,DC=lan  
+DN du compte : GSB\Administrateur  
+Mot de passe : Azerty1+  
+Champ de l'identifiant : samaccountname  
  
-Pour importer les utilisateurs allez dans **Administration > Utilisateur > Liaison annuaire LDAP > Importation de nouveau utilisateurs**
+Pour importer les utilisateurs allez dans Administration > Utilisateur > Liaison annuaire LDAP > Importation de nouveau utilisateurs
 Appuyer sur rechercher  
 Puis sélectionner les utilisateurs afficher, allez dans action et sélectionnez importer. 
-
-## Rejoindre le domaine gsb.lan depuis un client windows : 
- 
-Afin de rejoindre le domaine **gsb.lan**, il est nécessaire d'ajouter en guise de serveur DNS sur la machine cliente le serveur DNS de l'Active Directory **s-win.gsb.lan**.
-
-Il est possible d'ainsi rejoindre le domaine **gsb.lan**.
-Nous utiliserons pour se connecter à l'Active Directory l'utilisateur **Administrateur**:
-
-* **Login**: **Administrateur@gsb.lan**
-* **Mot de passe**: **Azerty1+** 
-
-## Les modification à faire pour un prochaine version de GLPI :
-Pour les prochaines versions de GLPI et pouvoir utiliser le playbook, voici les modification à faire : 
- * Changer la version de GLPI
- * Changer la version de PHP 
- * Changer la version de GLPI Agent
-
- *Modification effectué par : jm - ak*
-
-
 

--- a/roles/glpi/handlers/main.yml
+++ b/roles/glpi/handlers/main.yml
@ -1,15 +1,9 @@
 ---
  - name: restart php-fpm
-    service:
-      name: php8.2-fpm
-      state=: restarted
+    service: name=php8.2-fpm state=restarted

  - name: restart nginx
-    service:
-      name: nginx
-      state: restarted
+    service: name=nginx state=restarted

  - name: restart mariadb-server
-    service:
-      name: mariadb-server
-      state: restarted
+    service: name=mariadb-server state=restarted
--- a/roles/glpi/tasks/main.yml
+++ b/roles/glpi/tasks/main.yml
@ -139,7 +139,7 @@
      - restart nginx

  - name: lancer la commande de création de la base de donnees glpi
-    ansible.builtin.shell: "php bin/console database:install --reconfigure  --db-name {{ glpi_dbname }} --db-user {{ glpi_dbuser }} --db-password {{ glpi_dbpasswd }} -f -n" 
+    ansible.builtin.shell: php bin/console database:install -f -n 
    args:
      chdir: "{{ glpi_dir }}" 

--- a/roles/gotify/tasks/main.yml
+++ b/roles/gotify/tasks/main.yml
@ -1,50 +0,0 @@
---
-    - name: Mise a jour apt cache
-      apt:
-        update_cache: yes
-
-    - name: Creation /etc/gotify
-      ansible.builtin.file:
-        path: /etc/gotify
-        state: directory
-        mode: '0755'
-
-    - name: Creation /opt/gotify
-      ansible.builtin.file:
-        path: /opt/gotify
-        state: directory
-        mode: '0755'
-
-    - name: installation de gotify
-      get_url:
-        url: "https://github.com/gotify/server/releases/latest/download/gotify-linux-amd64.zip"
-        dest: "/tmp/gotify.zip"
-
-    - name: Extraction de Gotify
-      ansible.builtin.unarchive:
-        src: "/tmp/gotify.zip"
-        dest: "/opt/gotify"
-      become: yes
-
-    - name: Creation du fichier systemd
-      template:
-        src: "gotify.service.j2"
-        dest: "/etc/systemd/system/gotify.service"
-      become: yes
-
-    - name: Reload systemd
-      systemd:
-        daemon_reload: yes
-
-    - name: Creation du fichier conf gotify
-      template:
-        src: "config.yml.j2"
-        dest: "/etc/gotify/config.yml"
-      become: yes
-
-    - name: Demarage du gotify
-      systemd:
-        name: gotify
-        state: started
-        enabled: yes
-
--- a/roles/gotify/templates/config.yml.j2
+++ b/roles/gotify/templates/config.yml.j2
@ -1,4 +0,0 @@
-server:
-  keepaliveperiodseconds: 0
-  listenaddr: "" # the address to bind on, leave empty to bind on all addresses
-  port: 8008
--- a/roles/gotify/templates/gotify.service.j2
+++ b/roles/gotify/templates/gotify.service.j2
@ -1,13 +0,0 @@
-[Unit]
-Description=Gotify Server
-After=network.target
-
-[Service]
-Type=simple
-User=root
-ExecStart=/opt/gotify/gotify-linux-amd64
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-
--- a/roles/journald-rcv/README.md
+++ b/roles/journald-rcv/README.md
@ -1,30 +1,16 @@
-# Role journald-rcv : installation et configuration du serveur systemd-journal-remote (centralisation des logs)
+# Role syslog : installation et configuration de syslog serveur (centralisation des logs)
 ***
-## Fonctionnalitées du rôle:

-Ce role a pour objectif d'installer et d'éditer les fichiers de configuration de systemd journal remote afin que les machines lançant ce rôle puissent recevoir les logs des autres machine du parc.
+Ce role a pour objectif de activer le module UDP dans le fichier /etc/rsyslog.conf pour accepter les logs entrants des machines concernées :
+on décommente la ligne suivante :
+'module(load="imudp"\)'

-##  Opérations réalisées par le role:
-Le role réalise les opération suivante:
-* installation du paquet **systemd-journal-remote**.
-* Démarrage et activation (au démarrage) du service **systemd-journal-remote.socket.
-* Création des fichiers de configuration de **systemd-journal-remote** à partir d'une copie du fichier de configuration déja existante.
-* Changement du protocole utilisé par journald. Passant du protocole **HTTPS** au protocole **HTTP*** Activation du mode split qui permet d'avoir un fichier de log par machine supervisées.
-* Création du répertoire qui accueillera les fichiers de logs.
-* Rédémarrage du daemon systemd afin que le système prenne en compte les modifications efféctuées.
+Ensuite le role active l'écoute du module UDP sur le port 514 afin de pouvoir envoyer les logs.
+on décommente la ligne suivante dans le même fichier que ci-dessus :
+'input\(type="imudp" port="514"\)'

-## Test du bon fonctionnement du rôle
+pour finir le role  va charger le module UDP afin que la machine **s-infra** puissent reçevoir les logs entrants.
+Pour faire cela on décommente la ligne suivante dans le fichier /etc/systemd/journald.conf :
+'ForwardToSyslog=yes'

-Afin de tester le rôle nous éffectuons un test:
-
-**Depuis la machine sur laquelle ce rôle est installé:**
-* **journalctl -f -D /var/log/journal/remote/
-* S'assurer que le port 19532 (port par défault utilisé par le serviceà) soit ouvert et utilisable sur toutes les machines en entrée.
-
-Afin de consulter les fichiers d'événement.
-
-** Depuis une des machines eméttrices de logs:**
-
-* **logger ok**
-
-Si le message émis par la machine éméttrice et consultable depuis la machine receptrice alors le test est réussi.
+pour finir le role va redemmarer automatiquement les services journald et rsyslog
--- a/roles/kea/README.md
+++ b/roles/kea/README.md
@ -1,21 +0,0 @@
-# Rôle Kea
-***
-Rôle Kea: Configuration de 2 serveurs KEA en mode haute disponbilité.
-
-## Tables des matières
-    1. [Que fait le rôle Kea ?]
-    2. [Installation et configuration de ka]
-    3. [Remarques]
-
-
-## Que fait le rôle Kea ?
-Le rôle KEA permet de configurer 1  serveurs kea (s-kea1 et s-kea2) en mode haute disponibilité.
- Le serveur **s-kea1** sera en mode **primary** il délivrera les baux DHCP sur le réseau n-user.
- Le serveur **s-kea2**, sera en mode **stand-by** le service DHCP basculera donc sur **s-kea2** en cas disponibilité du serveur**s-kea1**. 
-
-### Installation et configuration de kea
-
-Le rôle kea installe les packets **kea dhcp4, hooks, admin** une fois les packets installer. Il configure un  serveur kea pour qu'il distribue les ips sur le réseau n-user et soit en haute disponibilité.
-
-### Remarquees ###
-Une fois le playbook **s-kea** correctement terminé et la machine **s-kea** redemarrée, redémarrée le service **isc-kea-dhcp4.service** afin de prendre en compte les modifications éfféctuées sur la couche réseau par le role POST.
--- a/roles/kea/default/main.yml
+++ b/roles/kea/default/main.yml
@ -1,8 +0,0 @@
-#variable kea
- kea_ver: "2.4.1"
-  kea_dbname: ""
-  kaa_dbuser: ""
-  kea_dbpasswd: ""
-  kea_dhcp4_dir: "/etc/kea/kea-dhcp4.conf"
-  kea_ctrl_dir: "/etc/kea/kea-ctrl-agent.conf"
-
--- a/roles/kea/files/kea-ctrl-agent.conf
+++ b/roles/kea/files/kea-ctrl-agent.conf
@ -1,66 +0,0 @@
-// This is an example of a configuration for Control-Agent (CA) listening
-// for incoming HTTP traffic. This is necessary for handling API commands,
-// in particular lease update commands needed for HA setup.
-{
-    "Control-agent":
-    {
-        // We need to specify where the agent should listen to incoming HTTP
-        // queries.
-        "http-host": "172.16.0.20",
-
-        // This specifies the port CA will listen on.
-        "http-port": 8000,
-
-        "control-sockets":
-        {
-            // This is how the Agent can communicate with the DHCPv4 server.
-            "dhcp4":
-            {
-                "comment": "socket to DHCPv4 server",
-                "socket-type": "unix",
-                "socket-name": "/tmp/kea4-ctrl-socket"
-            },
-
-            // Location of the DHCPv6 command channel socket.
-           # "dhcp6":
-           # {
-           #     "socket-type": "unix",
-           #     "socket-name": "/tmp/kea6-ctrl-socket"
-           # },
-
-            // Location of the D2 command channel socket.
-           # "d2":
-           # {
-           #     "socket-type": "unix",
-           #     "socket-name": "/tmp/kea-ddns-ctrl-socket",
-           #     "user-context": { "in-use": false }
-           # }
-        },
-
-        // Similar to other Kea components, CA also uses logging.
-        "loggers": [
-            {
-                "name": "kea-ctrl-agent",
-                "output_options": [
-                    {
-                        "output": "stdout",
-
-                        // Several additional parameters are possible in addition
-                        // to the typical output. Flush determines whether logger
-                        // flushes output to a file. Maxsize determines maximum
-                        // filesize before the file is rotated. maxver
-                        // specifies the maximum number of rotated files being
-                        // kept.
-                        "flush": true,
-                        "maxsize": 204800,
-                        "maxver": 4,
-                        // We use pattern to specify custom log message layout
-                        "pattern": "%d{%y.%m.%d %H:%M:%S.%q} %-5p [%c/%i] %m\n"
-                    }
-                ],
-                "severity": "INFO",
-                "debuglevel": 0 // debug level only applies when severity is set to DEBUG.
-            }
-        ]
-    }
-}
--- a/roles/kea/files/kea-dhcp4.conf
+++ b/roles/kea/files/kea-dhcp4.conf
@ -1,226 +0,0 @@
-// This is an example configuration of the Kea DHCPv4 server 1:
-//
-// - uses High Availability hook library and Lease Commands hook library
-//   to enable High Availability function for the DHCP server. This config
-//   file is for the primary (the active) server.
-// - uses memfile, which stores lease data in a local CSV file
-// - it assumes a single /24 addressing over a link that is directly reachable
-//   (no DHCP relays)
-// - there is a handful of IP reservations
-//
-// It is expected to run with a standby (the passive) server, which has a very similar
-// configuration. The only difference is that "this-server-name" must be set to "server2" on the
-// other server. Also, the interface configuration depends on the network settings of the
-// particular machine.
-
-{
-
-"Dhcp4": {
-
-    // Add names of your network interfaces to listen on.
-    "interfaces-config": {
-        // The DHCPv4 server listens on this interface. When changing this to
-        // the actual name of your interface, make sure to also update the
-        // interface parameter in the subnet definition below.
-        "interfaces": [ "enp0s9" ]
-    },
-
-    // Control socket is required for communication between the Control
-    // Agent and the DHCP server. High Availability requires Control Agent
-    // to be running because lease updates are sent over the RESTful
-    // API between the HA peers.
-    "control-socket": {
-        "socket-type": "unix",
-        "socket-name": "/tmp/kea4-ctrl-socket"
-    },
-
-    // Use Memfile lease database backend to store leases in a CSV file.
-    // Depending on how Kea was compiled, it may also support SQL databases
-    // (MySQL and/or PostgreSQL). Those database backends require more
-    // parameters, like name, host and possibly user and password.
-    // There are dedicated examples for each backend. See Section 7.2.2 "Lease
-    // Storage" for details.
-    "lease-database": {
-        // Memfile is the simplest and easiest backend to use. It's an in-memory
-        // database with data being written to a CSV file. It is very similar to
-        // what ISC DHCP does.
-        "type": "memfile"
-    },
-
-    // Let's configure some global parameters. The home network is not very dynamic
-    // and there's no shortage of addresses, so no need to recycle aggressively.
-    "valid-lifetime": 43200, // leases will be valid for 12h
-    "renew-timer": 21600, // clients should renew every 6h
-    "rebind-timer": 32400, // clients should start looking for other servers after 9h
-
-    // Kea will clean up its database of expired leases once per hour. However, it
-    // will keep the leases in expired state for 2 days. This greatly increases the
-    // chances for returning devices to get the same address again. To guarantee that,
-    // use host reservation.
-    // If both "flush-reclaimed-timer-wait-time" and "hold-reclaimed-time" are
-    // not 0, when the client sends a release message the lease is expired
-    // instead of being deleted from lease storage.
-    "expired-leases-processing": {
-        "reclaim-timer-wait-time": 3600,
-        "hold-reclaimed-time": 172800,
-        "max-reclaim-leases": 0,
-        "max-reclaim-time": 0
-    },
-
-    // HA requires two hook libraries to be loaded: libdhcp_lease_cmds.so and
-    // libdhcp_ha.so. The former handles incoming lease updates from the HA peers.
-    // The latter implements high availability feature for Kea. Note the library name
-    // should be the same, but the path is OS specific.
-    "hooks-libraries": [
-        // The lease_cmds library must be loaded because HA makes use of it to
-        // deliver lease updates to the server as well as synchronize the
-        // lease database after failure.
-        {
-            "library": "/usr/local/lib/kea/hooks/libdhcp_lease_cmds.so"
-        },
-
-        {
-            // The HA hook library should be loaded.
-            "library": "/usr/local/lib/kea/hooks/libdhcp_ha.so",
-            "parameters": {
-                // Each server should have the same HA configuration, except for the
-                // "this-server-name" parameter.
-                "high-availability": [ {
-                    // This parameter points to this server instance. The respective
-                    // HA peers must have this parameter set to their own names.
-                    "this-server-name": "s-kea1.gsb.lan",
-                    // The HA mode is set to hot-standby. In this mode, the active server handles
-                    // all the traffic. The standby takes over if the primary becomes unavailable.
-                    "mode": "hot-standby",
-                    // Heartbeat is to be sent every 10 seconds if no other control
-                    // commands are transmitted.
-                    "heartbeat-delay": 10000,
-                    // Maximum time for partner's response to a heartbeat, after which
-                    // failure detection is started. This is specified in milliseconds.
-                    // If we don't hear from the partner in 60 seconds, it's time to
-                    // start worrying.
-                    "max-response-delay": 30000,
-                    // The following parameters control how the server detects the
-                    // partner's failure. The ACK delay sets the threshold for the
-                    // 'secs' field of the received discovers. This is specified in
-                    // milliseconds.
-                    "max-ack-delay": 5000,
-                    // This specifies the number of clients which send messages to
-                    // the partner but appear to not receive any response.
-                    "max-unacked-clients": 0,
-                    // This specifies the maximum timeout (in milliseconds) for the server
-                    // to complete sync. If you have a large deployment (high tens or
-                    // hundreds of thousands of clients), you may need to increase it
-                    // further. The default value is 60000ms (60 seconds).
-                    "sync-timeout": 60000,
-                    "peers": [
-                        // This is the configuration of this server instance.
-                        {
-                            "name": "s-kea1.gsb.lan",
-                            // This specifies the URL of this server instance. The
-                            // Control Agent must run along with this DHCPv4 server
-                            // instance and the "http-host" and "http-port" must be
-                            // set to the corresponding values.
-                            "url": "http://172.16.64.20:8000/",
-                            // This server is primary. The other one must be
-                            // secondary.
-                            "role": "primary"
-                        },
-                        // This is the configuration of the secondary server.
-                        {
-                            "name": "s-kea2.gsb.lan",
-                            // Specifies the URL on which the partner's control
-                            // channel can be reached. The Control Agent is required
-                            // to run on the partner's machine with "http-host" and
-                            // "http-port" values set to the corresponding values.
-                            "url": "http://172.16.64.21:8000/",
-                            // The other server is secondary. This one must be
-                            // primary.
-                            "role": "standby"
-                        }
-                    ]
-                } ]
-            }
-        }
-    ],
-
-    // This example contains a single subnet declaration.
-    "subnet4": [
-        {
-            // Subnet prefix.
-            "subnet": "172.16.64.0/24",
-
-            // There are no relays in this network, so we need to tell Kea that this subnet
-            // is reachable directly via the specified interface.
-            "interface": "enp0s9",
-
-            // Specify a dynamic address pool.
-            "pools": [
-                {
-                    "pool": "172.16.64.100-172.16.64.150"
-                }
-            ],
-
-            // These are options that are subnet specific. In most cases, you need to define at
-            // least routers option, as without this option your clients will not be able to reach
-            // their default gateway and will not have Internet connectivity. If you have many
-            // subnets and they share the same options (e.g. DNS servers typically is the same
-            // everywhere), you may define options at the global scope, so you don't repeat them
-            // for every network.
-            "option-data": [
-                {
-                    // For each IPv4 subnet you typically need to specify at least one router.
-                    "name": "routers",
-                    "data": "172.16.64.254"
-                },
-                {
-                    // Using cloudflare or Quad9 is a reasonable option. Change this
-                    // to your own DNS servers is you have them. Another popular
-                    // choice is 8.8.8.8, owned by Google. Using third party DNS
-                    // service raises some privacy concerns.
-                    "name": "domain-name-servers",
-                    "data": "172.16.0.1"
-                }
-            ],
-
-            // Some devices should get a static address. Since the .100 - .199 range is dynamic,
-            // let's use the lower address space for this. There are many ways how reservation
-            // can be defined, but using MAC address (hw-address) is by far the most popular one.
-            // You can use client-id, duid and even custom defined flex-id that may use whatever
-            // parts of the packet you want to use as identifiers. Also, there are many more things
-            // you can specify in addition to just an IP address: extra options, next-server, hostname,
-            // assign device to client classes etc. See the Kea ARM, Section 8.3 for details.
-            // The reservations are subnet specific.
-            #"reservations": [
-            #    {
-            #        "hw-address": "1a:1b:1c:1d:1e:1f",
-            #        "ip-address": "192.168.1.10"
-            #    },
-            #    {
-            #        "client-id": "01:11:22:33:44:55:66",
-            #        "ip-address": "192.168.1.11"
-            #    }
-            #]
-        }
-    ],
-	// fichier de logs
-     "loggers": [
-     {
-        // This section affects kea-dhcp4, which is the base logger for DHCPv4 component. It tells
-        // DHCPv4 server to write all log messages (on severity INFO or higher) to a file. The file
-        // will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel
-        // (range 0 to 99) is used only when logging on DEBUG level.
-        "name": "kea-dhcp4",
-        "output_options": [
-            {
-                "output": "stdout",
-                "maxsize": 2048000,
-                "maxver": 4
-            }
-        ],
-        "severity": "INFO",
-        "debuglevel": 0
-    }
-  ]
-}
-}
--- a/roles/kea/handlers/main.yml
+++ b/roles/kea/handlers/main.yml
@ -1,12 +0,0 @@
---  
- name: Restart isc-kea-dhcp4-server
-  ansible.builtin.service:
-    name: isc-kea-dhcp4-server.service
-    state: restarted
-    enabled: yes
-
- name: Restart isc-kea-ctrl-agent
-  ansible.builtin.service:
-    name: isc-kea-ctrl-agent.service
-    state: restarted
-    enabled: yes
--- a/roles/kea/tasks/main.yml
+++ b/roles/kea/tasks/main.yml
@ -1,43 +0,0 @@
---  
-
- name: Preparation  
-  ansible.builtin.shell: curl -1sLf 'https://dl.cloudsmith.io/public/isc/kea-2-4/setup.deb.sh' | sudo -E bash
-
- name: Update apt
-  ansible.builtin.apt:
-    update_cache: yes
-
-      #- name: Installation paquet isc-kea-common
-      #  ansible.builtin.apt:
-      #    deb: isc-kea-common
-      #    state: present
-
- name: Installation isc-kea-dhcp4
-  ansible.builtin.apt:
-    name: isc-kea-dhcp4-server
-    state: present
-
- name: Installation isc-kea-ctrl-agent
-  ansible.builtin.apt:
-    name: isc-kea-ctrl-agent
-    state: present
-
- name: Installation isc-kea-hooks
-  ansible.builtin.apt:
-    name: isc-kea-hooks
-    state: present
-
- name: Generation ---- du fichier de configuration kea-ctrl-agent
-  ansible.builtin.template:
-    src: kea-ctrl-agent.conf.j2
-    dest: /etc/kea/kea-ctrl-agent.conf
-  notify:
-    - Restart isc-kea-ctrl-agent
-
- name: Generation du fichier de configuration kea-dhcp4.conf
-  ansible.builtin.template:
-    src: kea-dhcp4.conf.j2
-    dest: /etc/kea/kea-dhcp4.conf
-  notify:
-    - Restart isc-kea-dhcp4-server
-
--- a/roles/kea/templates/kea-ctrl-agent.conf.j2
+++ b/roles/kea/templates/kea-ctrl-agent.conf.j2
@ -1,32 +0,0 @@
-{
-    "Control-agent":
-    {
-        "http-host": "{{ kea_ctrl_address_this }}",
-        "http-port": 8000,
-        "control-sockets":
-        {
-            "dhcp4":
-            {
-                "socket-type": "unix",
-                "socket-name": "/tmp/kea4-ctrl-socket"
-            },
-        },
-
-        "loggers": [
-            {
-                "name": "kea-ctrl-agent",
-                "output_options": [
-                    {
-                        "output": "stdout",
-                        "flush": true,
-                        "maxsize": 204800,
-                        "maxver": 4,
-{% raw %}               "pattern": "%d{%y.%m.%d %H:%M:%S.%q} %-5p [%c/%i] %m\n", {% endraw %}
-                    }
-                ],
-                "severity": "INFO",
-		"debuglevel": 0
-            }
-        ]
-    }
-}
--- a/roles/kea/templates/kea-dhcp4.conf.j2
+++ b/roles/kea/templates/kea-dhcp4.conf.j2
@ -1,226 +0,0 @@
-// This is an example configuration of the Kea DHCPv4 server 1:
-//
-// - uses High Availability hook library and Lease Commands hook library
-//   to enable High Availability function for the DHCP server. This config
-//   file is for the primary (the active) server.
-// - uses memfile, which stores lease data in a local CSV file
-// - it assumes a single /24 addressing over a link that is directly reachable
-//   (no DHCP relays)
-// - there is a handful of IP reservations
-//
-// It is expected to run with a standby (the passive) server, which has a very similar
-// configuration. The only difference is that "this-server-name" must be set to "server2" on the
-// other server. Also, the interface configuration depends on the network settings of the
-// particular machine.
-
-{
-
-"Dhcp4": {
-
-    // Add names of your network interfaces to listen on.
-    "interfaces-config": {
-        // The DHCPv4 server listens on this interface. When changing this to
-        // the actual name of your interface, make sure to also update the
-        // interface parameter in the subnet definition below.
-        "interfaces": ["{{ kea_dhcp_int }}"]
-    },
-
-    // Control socket is required for communication between the Control
-    // Agent and the DHCP server. High Availability requires Control Agent
-    // to be running because lease updates are sent over the RESTful
-    // API between the HA peers.
-    "control-socket": {
-        "socket-type": "unix",
-        "socket-name": "/tmp/kea4-ctrl-socket"
-    },
-
-    // Use Memfile lease database backend to store leases in a CSV file.
-    // Depending on how Kea was compiled, it may also support SQL databases
-    // (MySQL and/or PostgreSQL). Those database backends require more
-    // parameters, like name, host and possibly user and password.
-    // There are dedicated examples for each backend. See Section 7.2.2 "Lease
-    // Storage" for details.
-    "lease-database": {
-        // Memfile is the simplest and easiest backend to use. It's an in-memory
-        // database with data being written to a CSV file. It is very similar to
-        // what ISC DHCP does.
-        "type": "memfile"
-    },
-
-    // Let's configure some global parameters. The home network is not very dynamic
-    // and there's no shortage of addresses, so no need to recycle aggressively.
-    "valid-lifetime": 43200, // leases will be valid for 12h
-    "renew-timer": 21600, // clients should renew every 6h
-    "rebind-timer": 32400, // clients should start looking for other servers after 9h
-
-    // Kea will clean up its database of expired leases once per hour. However, it
-    // will keep the leases in expired state for 2 days. This greatly increases the
-    // chances for returning devices to get the same address again. To guarantee that,
-    // use host reservation.
-    // If both "flush-reclaimed-timer-wait-time" and "hold-reclaimed-time" are
-    // not 0, when the client sends a release message the lease is expired
-    // instead of being deleted from lease storage.
-    "expired-leases-processing": {
-        "reclaim-timer-wait-time": 3600,
-        "hold-reclaimed-time": 172800,
-        "max-reclaim-leases": 0,
-        "max-reclaim-time": 0
-    },
-
-    // HA requires two hook libraries to be loaded: libdhcp_lease_cmds.so and
-    // libdhcp_ha.so. The former handles incoming lease updates from the HA peers.
-    // The latter implements high availability feature for Kea. Note the library name
-    // should be the same, but the path is OS specific.
-    "hooks-libraries": [
-        // The lease_cmds library must be loaded because HA makes use of it to
-        // deliver lease updates to the server as well as synchronize the
-        // lease database after failure.
-        {
-            "library": "/usr/lib/x86_64-linux-gnu/kea/hooks/libdhcp_lease_cmds.so"
-        },
-
-        {
-            // The HA hook library should be loaded.
-            "library": "/usr/lib/x86_64-linux-gnu/kea/hooks/libdhcp_ha.so",
-            "parameters": {
-                // Each server should have the same HA configuration, except for the
-                // "this-server-name" parameter.
-                "high-availability": [ {
-                    // This parameter points to this server instance. The respective
-                    // HA peers must have this parameter set to their own names.
-                    "this-server-name": "{{ kea_this_server }}",
-                    // The HA mode is set to hot-standby. In this mode, the active server handles
-                    // all the traffic. The standby takes over if the primary becomes unavailable.
-                    "mode": "hot-standby",
-                    // Heartbeat is to be sent every 10 seconds if no other control
-                    // commands are transmitted.
-                    "heartbeat-delay": 10000,
-                    // Maximum time for partner's response to a heartbeat, after which
-                    // failure detection is started. This is specified in milliseconds.
-                    // If we don't hear from the partner in 60 seconds, it's time to
-                    // start worrying.
-                    "max-response-delay": 30000,
-                    // The following parameters control how the server detects the
-                    // partner's failure. The ACK delay sets the threshold for the
-                    // 'secs' field of the received discovers. This is specified in
-                    // milliseconds.
-                    "max-ack-delay": 5000,
-                    // This specifies the number of clients which send messages to
-                    // the partner but appear to not receive any response.
-                    "max-unacked-clients": 0,
-                    // This specifies the maximum timeout (in milliseconds) for the server
-                    // to complete sync. If you have a large deployment (high tens or
-                    // hundreds of thousands of clients), you may need to increase it
-                    // further. The default value is 60000ms (60 seconds).
-                    "sync-timeout": 60000,
-                    "peers": [
-                        // This is the configuration of this server instance.
-                        {
-                            "name": "{{ kea_srv1 }}",
-                            // This specifies the URL of this server instance. The
-                            // Control Agent must run along with this DHCPv4 server
-                            // instance and the "http-host" and "http-port" must be
-                            // set to the corresponding values.
-                            "url": "http://{{ kea_ctrl_address1 }}:8000/",
-                            // This server is primary. The other one must be
-                            // secondary.
-                            "role": "primary"
-                        },
-                        // This is the configuration of the secondary server.
-                        {
-                            "name": "{{ kea_srv2 }}",
-                            // Specifies the URL on which the partner's control
-                            // channel can be reached. The Control Agent is required
-                            // to run on the partner's machine with "http-host" and
-                            // "http-port" values set to the corresponding values.
-                            "url": "http://{{ kea_ctrl_address2 }}:8000/",
-                            // The other server is secondary. This one must be
-                            // primary.
-                            "role": "standby"
-                        }
-                    ]
-                } ]
-            }
-        }
-    ],
-
-    // This example contains a single subnet declaration.
-    "subnet4": [
-        {
-            // Subnet prefix.
-            "subnet": "172.16.64.0/24",
-
-            // There are no relays in this network, so we need to tell Kea that this subnet
-            // is reachable directly via the specified interface.
-            "interface": "enp0s9",
-
-            // Specify a dynamic address pool.
-            "pools": [
-                {
-                    "pool": "172.16.64.100-172.16.64.150"
-                }
-            ],
-
-            // These are options that are subnet specific. In most cases, you need to define at
-            // least routers option, as without this option your clients will not be able to reach
-            // their default gateway and will not have Internet connectivity. If you have many
-            // subnets and they share the same options (e.g. DNS servers typically is the same
-            // everywhere), you may define options at the global scope, so you don't repeat them
-            // for every network.
-            "option-data": [
-                {
-                    // For each IPv4 subnet you typically need to specify at least one router.
-                    "name": "routers",
-                    "data": "172.16.64.254"
-                },
-                {
-                    // Using cloudflare or Quad9 is a reasonable option. Change this
-                    // to your own DNS servers is you have them. Another popular
-                    // choice is 8.8.8.8, owned by Google. Using third party DNS
-                    // service raises some privacy concerns.
-                    "name": "domain-name-servers",
-                    "data": "172.16.0.1"
-                }
-            ],
-
-            // Some devices should get a static address. Since the .100 - .199 range is dynamic,
-            // let's use the lower address space for this. There are many ways how reservation
-            // can be defined, but using MAC address (hw-address) is by far the most popular one.
-            // You can use client-id, duid and even custom defined flex-id that may use whatever
-            // parts of the packet you want to use as identifiers. Also, there are many more things
-            // you can specify in addition to just an IP address: extra options, next-server, hostname,
-            // assign device to client classes etc. See the Kea ARM, Section 8.3 for details.
-            // The reservations are subnet specific.
-            #"reservations": [
-            #    {
-            #        "hw-address": "1a:1b:1c:1d:1e:1f",
-            #        "ip-address": "192.168.1.10"
-            #    },
-            #    {
-            #        "client-id": "01:11:22:33:44:55:66",
-            #        "ip-address": "192.168.1.11"
-            #    }
-            #]
-        }
-    ],
-	// fichier de logs
-     "loggers": [
-     {
-        // This section affects kea-dhcp4, which is the base logger for DHCPv4 component. It tells
-        // DHCPv4 server to write all log messages (on severity INFO or higher) to a file. The file
-        // will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel
-        // (range 0 to 99) is used only when logging on DEBUG level.
-        "name": "kea-dhcp4",
-        "output_options": [
-            {
-                "output": "stdout",
-                "maxsize": 2048000,
-                "maxver": 4
-            }
-        ],
-        "severity": "INFO",
-        "debuglevel": 0
-    }
-  ]
-}
-}
--- a/roles/lb-bd/README.md
+++ b/roles/lb-bd/README.md
@ -1,10 +0,0 @@
-# Role lb-bd
-***
-Rôle lb-bd pour la mise en place de la base de données du serveur WordPress.
-
-## Tables des matières
-    1. Que fait le rôle lb-bd ?
-
-
-## Que fait le rôle lb-bd ?
-Ce rôle installe le paquet `mariadb-server` puis créé et configure la base de données nommée **wordpressdb** en ouvrant le port 3306 et en créant l'utilisateur MySQL nommé **wordpressuser** avec le mot de passe **wordpresspasswd**.
--- a/roles/lb-front/README.md
+++ b/roles/lb-front/README.md
@ -1,22 +0,0 @@
-# Rôle lb-front
-***
-Rôle lb-front pour la répartition de charge des serveurs web sur WordPress avec HAProxy
-
-## Tables des matières
-    1. Que fait le rôle lb-front ?
-    2. Ordre d'installation des serveurs.
-
-
-## Que fait le rôle lb-front ?
-
-Le rôle lb-front va installer `haproxy` pour le load balancing/la répartition de charge et va configurer le fichier `/etc/haproxy/haproxy.cfg`.
-
-le fichier va faire du Round-Robin, un algoritme qui va équilibrer le nombre de requêtes entre s-lb-web1 et s-lb-web2.
-
-le site web est accessibe à l'adresse <http://s-lb.gsb.adm>.
-
-## Ordre d'installation des serveurs.
-    1. Le serveur s-lb avec haproxy qui va "initialiser" les sous-réseaux dans la DMZ.
-    2. Le serveur s-lb-bd qui va contenir la base de données WordPress utilisée par les serveurs web.
-    3. Le serveur s-nas qui va stocker la configuration WordPress et la partager aux serveurs web en NFS. Il va aussi utiliser la base de données sur stockée s-lb-bd.
-    4. Les serveurs s-web1 et s-web2 qui vont installer Apache2, PHP et afficher le serveur WordPress.
--- a/roles/lb-front/files/goss.yaml
+++ b/roles/lb-front/files/goss.yaml
@ -0,0 +1,23 @@
+port:
+  tcp:80:
+    listening: true
+    ip:
+    - 192.168.100.11
+service:
+  haproxy:
+    enabled: true
+    running: true
+  sshd:
+    enabled: true
+    running: true
+interface:
+  enp0s8:
+    exists: true
+    addrs:
+    - 192.168.100.11/24
+    mtu: 1500
+  enp0s9:
+    exists: true
+    addrs:
+    - 192.168.101.254/24
+    mtu: 1500
--- a/roles/lb-front/files/haproxy.cfg
+++ b/roles/lb-front/files/haproxy.cfg
@ -41,7 +41,7 @@ frontend proxypublic
 backend fermeweb
 	balance roundrobin
 	option httpclose
-	option httpchk HEAD / HTTP/1.0
+	#option httpchk HEAD / HTTP/1.0
 	server s-lb-web1 192.168.101.1:80 check
 	server s-lb-web2 192.168.101.2:80 check

--- a/roles/lb-front/tasks/main.yml
+++ b/roles/lb-front/tasks/main.yml
@ -14,7 +14,7 @@
      backend fermeweb
        balance roundrobin
        option httpclose
-        option httpchk HEAD / HTTP/1.0
+        #option httpchk HEAD / HTTP/1.0
        server s-lb-web1 192.168.101.1:80 check
        server s-lb-web2 192.168.101.2:80 check

--- a/roles/lb-nfs-client/README.md
+++ b/roles/lb-nfs-client/README.md
@ -1,10 +1,3 @@
-# Rôle lb-nfs-client
-***
-Rôle lb-nfs-client pour l'accès au serveur NFS sur les serveurs lb-web1 et lb-web2.
-
-## Tables des matières
-    1. Que fait le rôle lb-nfs-client ?
-
-
-## Que fait le rôle lb-nfs-client ?  
-Ce rôle sert à installer le paquet `nfs-common` et à monter le répertoire /home/wordpress du s-nas dans /var/www/html/wordpress sur les serveurs webs.
+##Partage NFS
+  
+Ce rôle sert à installer nfs et à monter le répertoire /home/wordpress du s-nas dans /var/www/html/wordpress sur les serveurs webs.
--- a/roles/lb-nfs-server/README.md
+++ b/roles/lb-nfs-server/README.md
@ -1,17 +1,10 @@
-# Role lb-nfs-server
-***
-Rôle lb-nfs-server pour la mise en place du partage des fichiers de configuration de WordPress.
-
-## Tables des matières
-    1. Que fait le rôle lb-nfs-server ?
-
-
-## Que fait le rôle lb-nfs-server ?
+# Role s-nas-server
+## Installation de nfs-server et mise en oeuvre du partage /home/wordpress
+  
 Ce rôle :
-  * installe le paquet `nfs-server`
+  * installe **nfs-server**
  * copie le fichier de configuration **exports**  pour exporter le répertoire **/home/wordpress** 
-  * décompresse WordPress dans **/home/wordpress**
-  * relance le service `nfs-server`
-  * Configure l'accès de WordPress à la base de données dans le fichier `wp-config.php`
-
-Le répertoire **/home/wordpress** est exporté par NFS  dans le sous-réseau **n-dmz-db**
+  * relance le service **nfs-server**
+  * décompresse wordpress
+### Objectif
+Le répertoire **/home/wordpress** est exporté par **nfs** sur le réseau **n-dmz-db**
--- a/roles/lb-nfs-server/tasks/main.yml
+++ b/roles/lb-nfs-server/tasks/main.yml
@ -16,7 +16,7 @@

 - name: 20 - decompresse wordpress
  unarchive:
-    src: http://s-adm.gsb.adm/gsbstore/wordpress-6.4.2-fr_FR.tar.gz
+    src: https://fr.wordpress.org/latest-fr_FR.tar.gz
    dest: /home/
    remote_src: yes

--- a/roles/lb-web/README.md
+++ b/roles/lb-web/README.md
@ -1,12 +1,3 @@
-# Rôle lb-web
-***
-Rôle lb-web pour l'affichage et l'utilisation du site web.
-
-## Tables des matières
-    1. Que fait le rôle lb-web ?
-
-
-## Que fait le rôle lb-web ?
-Ce rôle télécharge les paquets nécessaires au fonctionnement du site web (`apache2`, `php` et `mariadb-client`) qui permetront aux serveurs web d'accerder a la base de données de WordPress.
-
-Le site web est accessibe à l'adresse http://s-lb.gsb.adm.
+##Téléchargement et configuration de WordPress
+  
+Ce rôle télécharge wordpress depuis s-adm puis configure le fichier wp-config.php pour la situation du gsb.
--- a/roles/lb-web/defaults/main.yml
+++ b/roles/lb-web/defaults/main.yml
@ -1,2 +1,2 @@
 depl_url: "http://s-adm.gsb.adm/gsbstore/"
-depl_wordpress: "wordpress-6.4.2-fr_FR.tar.gz"
+depl_wordpress: "wordpress-6.1.1-fr_FR.tar.gz"
--- a/roles/nxc-traefik/README.md
+++ b/roles/nxc-traefik/README.md
@ -1,16 +1,8 @@
 # Installation de Nextcloud et du proxy inverse Traefik

-## Explication de l'installation de Nextcloud
-Afin de pouvoir faire fonctionner Nextcloud et Traefik, il faut mettre en place docker. Dans un premier plan, il vas donc falloir lancer le script **getall** sur **s-adm**. Ensuite dans un second temps, il faudra etre dans le fichier **/nxc** sur **s-nxc** et lancer **docker-compose.yaml**. Pour finir, il faudra ajouter l'authentification LDAP au nextcloud grace a l'AD de **s-win**. 
+Nextcloud et Traefik fonctionnent grâce à docker. Pour pouvoir faire fonctionner ce playbook, docker doit être installé.

-# <p align="center">Procédure d'installation</p>
-
-***
-## 1. Installation docker 
-
-Voir: https://gitea.lyc-lecastel.fr/gsb/gsb2024/src/branch/main/roles/docker
-
-## 2. Fonctionnement du playbook s-nxc
+## 1.

 Le playbook crée le dossier **nxc** à la racine de root.

@ -18,11 +10,11 @@ Les fichiers "nextcloud.yml" et "traefik.yml" y seront copiés depuis le répert

 Enfin, dans le répertoire nxc, sont créés les répertoires **certs** et **config**.

-### 2.1 Copie des fichiers 
+## 2. Copie des fichiers 

-Le playbook copie les fichiers placés dans "files" et les places dans les bons répertoires.
+ Le playbook copie les fichiers placés dans "files" et les placer dans les bons répertoires.

-### 2.2 Génération du certificat
+## 3. Génération du certificat

 Le playbook crée un certificat **x509** grâce à **mkcert**, il s'agit d'une solution permettant de créer des certificats auto-signés. Pour cela, il télécharge **mkcert** sur **s-adm** (utiliser le script **getall**).

@ -33,7 +25,7 @@ Pour créer le certificat, le playbook exécute les commandes (lancé depuis nxc
 /usr/local/bin/mkcert -install # Installe mkcert
 /usr/local/bin/mkcert -key-file key.pem -cert-file cert.pem "hôte.domaine.local" "*.domaine.local" #Crée le certificat le DNS spécifié
 ```
-## 3. Lancement 
+## 4. Lancement

 Le playbook lance les fichiers "docker-compose" à savoir : nextcloud.yml et traefik.yml qui démarrent les deux piles **docker**.

@ -45,28 +37,22 @@ ATTENTION : Après avoir relancé la VM, executez le script "nxc-start.sh" afin
 Une fois le script terminé, le site est disponible ici : https://s-nxc.gsb.lan


-## 4. Ajout authentification LDAP
+## 5. Ajout authentification LDAP

-Pour ajouter l'authentification LDAP au Nextcloud, depuis **n-user** il faut :
-* Une fois l'installation de Nextcloud terminé, cliquez sur le profil et "Application"
+Pour ajouter l'authentification LDAP au Nextcloud, il faut :
+* Une fois l'installation de Nextcloud terminé, cliquez sur le profil et Application
 * Dans vos applications, descendre et activer "LDAP user and group backend"
-* Puis cliquer sur le profil, puis "Paramètres d'administration" et dans "Administration" cliquer sur "Intégration LDAP/AD"
+* Puis cliquer sur le profil, puis Paramètres d'administration et dans Administration cliquer sur Intégration LDAP/AD
 * Une fois sur la page d'intégration LDAP/AD :
    * Dans Hôte mettre : 
-        > **ldap://s-win.gsb.lan**
-    * Cliquer sur "Détecter le port" (normalement le port 389 apparait)
+        > ldap://s-win.gsb.lan
+    * Cliquer sur Détecter le port (normalement le port 389 apparait)
    * Dans DN Utilisateur mettre :
-        > **CN=nextcloud,CN=Users,DC=gsb,DC=lan**
+        > CN=nextcloud,CN=Users,DC=GSB,DC=LAN
    * Mot de passe : 
-        > **Azerty1+**
-    * Et dans "Un DN de base par ligne" : 
-        > **DC=gsb,DC=lan** 
-    * Cliquer sur "Détecter le DN de base" (normalement il apparaitra automatiquement)
-* Après la configuration réaliser, cliquer sur "Continuer", puis cliquer 3 fois sur continuer
-* Une fois arrivé sur "Groupes", vous pouvez vous déconnecter du compte Admin et vous connecter avec un compte qui est dans l'AD.
-
-## Contributeurs
-
- LG
- CH
-
+        > Azerty1+
+    * Et dans Un DN de base par ligne : 
+        > DC=GSB,DC=LAN
+* Après la configuration passe OK
+* Une fois la configuration finie, cliquer 3 fois sur continuer
+* Une fois arrivé sur Groupes, vous pouvez vous déconnecter du compte Admin et vous connecter avec un compte qui est dans l'AD.
--- a/roles/nxc-traefik/files/docker-compose.yml
+++ b/roles/nxc-traefik/files/docker-compose.yml
@ -53,8 +53,8 @@ services:
    image: nextcloud
    container_name: app
    restart: always
-      #ports:
-      #- 8081:80
+    ports:
+      - 8081:80
    #links:
    depends_on:
      - db
--- a/roles/nxc-traefik/files/savenextcloud.sh
+++ b/roles/nxc-traefik/files/savenextcloud.sh
@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Mettre le serveur NextCloud en mode maintenance
-docker compose exec -u www-data app php occ maintenance:mode --on
-
-# Extraire les dossiers de sauvegarde
-cd /root/nxc
-
-# Copie locale de la sauvegarde
-rsync -Aavx nextcloud/ nextcloud-dirbkp/
-
-# Base de données MySQL/MariaDB
-docker compose exec db mysqldump -u nextcloud -pAzerty1+ nextcloud > nextcloud-sqlbkp.bak
-
-# Sortir du mode maintenance
-docker compose exec -u www-data app php occ maintenance:mode --off
-
-# création d'une archive
-tar cvfz nxc.tgz nextcloud-sqlbkp.bak nextcloud-dirbkp
-
-
-
--- a/roles/nxc-traefik/tasks/main.yml
+++ b/roles/nxc-traefik/tasks/main.yml
@ -21,11 +21,11 @@

 - name: Copie de dynamic.yml
  copy:
-    src: dynamic.yml
+    src: dynamic.yml   
    dest: /root/nxc/config

 - name: Copie de docker-compose.yml
-  copy:
+  copy: 
    src: docker-compose.yml
    dest: /root/nxc

@ -69,14 +69,8 @@
  args:
    chdir: /root/nxc

- name: vérification si le réseau proxy existe
-  command: docker network ls --filter name=proxy
-  register:  net_proxy
-
- name: création du réseau proxy
+- name: Creation reseau docker proxy
  command: docker network create proxy
-#  when: net_proxy.stdout.find('proxy') == -1
-  when: "'proxy' not in net_proxy.stdout"

    #- name: Démarrage du docker-compose...
    #command: /bin/bash docker-compose up -d
--- a/roles/old/kea-master/README.md
+++ b/roles/old/kea-master/README.md
@ -1,14 +0,0 @@
-# Rôle Kea
-***
-Rôle du Kea pour la haute disponibilité dhcp
-
-## Tables des matières
-    1. [Que fait le rôle Kea ?]
-
-
-## Que fait le rôle Kea ?
-Il permet de configurer les serveur kea en mode haute disponibilité.
-
-### Installation et configuration de kea
-
-Le rôle kea va installer les packets kea dhcp4, hook, admin une fois les packets installer. Nous allons configurer les 2 serveurs kea pour qu'il distribut les ip de n-user et soit en haute disponibilité.
--- a/roles/old/kea-master/default/main.yml
+++ b/roles/old/kea-master/default/main.yml
@ -1,8 +0,0 @@
-#variable kea
- kea_ver: "2.4.1"
-  kea_dbname: ""
-  kaa_dbuser: ""
-  kea_dbpasswd: ""
-  kea_dhcp4_dir: "/etc/kea/kea-dhcp4.conf"
-  kea_ctrl_dir: "/etc/kea/kea-ctrl-agent.conf"
-
--- a/roles/old/kea-master/files/kea-ctrl-agent.conf
+++ b/roles/old/kea-master/files/kea-ctrl-agent.conf
@ -1,66 +0,0 @@
-// This is an example of a configuration for Control-Agent (CA) listening
-// for incoming HTTP traffic. This is necessary for handling API commands,
-// in particular lease update commands needed for HA setup.
-{
-    "Control-agent":
-    {
-        // We need to specify where the agent should listen to incoming HTTP
-        // queries.
-        "http-host": "172.16.64.20",
-
-        // This specifies the port CA will listen on.
-        "http-port": 8000,
-
-        "control-sockets":
-        {
-            // This is how the Agent can communicate with the DHCPv4 server.
-            "dhcp4":
-            {
-                "comment": "socket to DHCPv4 server",
-                "socket-type": "unix",
-                "socket-name": "/tmp/kea4-ctrl-socket"
-            },
-
-            // Location of the DHCPv6 command channel socket.
-           # "dhcp6":
-           # {
-           #     "socket-type": "unix",
-           #     "socket-name": "/tmp/kea6-ctrl-socket"
-           # },
-
-            // Location of the D2 command channel socket.
-           # "d2":
-           # {
-           #     "socket-type": "unix",
-           #     "socket-name": "/tmp/kea-ddns-ctrl-socket",
-           #     "user-context": { "in-use": false }
-           # }
-        },
-
-        // Similar to other Kea components, CA also uses logging.
-        "loggers": [
-            {
-                "name": "kea-ctrl-agent",
-                "output_options": [
-                    {
-                        "output": "stdout",
-
-                        // Several additional parameters are possible in addition
-                        // to the typical output. Flush determines whether logger
-                        // flushes output to a file. Maxsize determines maximum
-                        // filesize before the file is rotated. maxver
-                        // specifies the maximum number of rotated files being
-                        // kept.
-                        "flush": true,
-                        "maxsize": 204800,
-                        "maxver": 4,
-                        // We use pattern to specify custom log message layout
-                        "pattern": "%d{%y.%m.%d %H:%M:%S.%q} %-5p [%c/%i] %m\n"
-                    }
-                ],
-                "severity": "INFO",
-                "debuglevel": 0 // debug level only applies when severity is set to DEBUG.
-            }
-        ]
-    }
-}
--- a/roles/old/kea-master/files/kea-dhcp4.conf
+++ b/roles/old/kea-master/files/kea-dhcp4.conf
@ -1,226 +0,0 @@
-// This is an example configuration of the Kea DHCPv4 server 1:
-//
-// - uses High Availability hook library and Lease Commands hook library
-//   to enable High Availability function for the DHCP server. This config
-//   file is for the primary (the active) server.
-// - uses memfile, which stores lease data in a local CSV file
-// - it assumes a single /24 addressing over a link that is directly reachable
-//   (no DHCP relays)
-// - there is a handful of IP reservations
-//
-// It is expected to run with a standby (the passive) server, which has a very similar
-// configuration. The only difference is that "this-server-name" must be set to "server2" on the
-// other server. Also, the interface configuration depends on the network settings of the
-// particular machine.
-
-{
-
-"Dhcp4": {
-
-    // Add names of your network interfaces to listen on.
-    "interfaces-config": {
-        // The DHCPv4 server listens on this interface. When changing this to
-        // the actual name of your interface, make sure to also update the
-        // interface parameter in the subnet definition below.
-        "interfaces": [ "enp0s9" ]
-    },
-
-    // Control socket is required for communication between the Control
-    // Agent and the DHCP server. High Availability requires Control Agent
-    // to be running because lease updates are sent over the RESTful
-    // API between the HA peers.
-    "control-socket": {
-        "socket-type": "unix",
-        "socket-name": "/tmp/kea4-ctrl-socket"
-    },
-
-    // Use Memfile lease database backend to store leases in a CSV file.
-    // Depending on how Kea was compiled, it may also support SQL databases
-    // (MySQL and/or PostgreSQL). Those database backends require more
-    // parameters, like name, host and possibly user and password.
-    // There are dedicated examples for each backend. See Section 7.2.2 "Lease
-    // Storage" for details.
-    "lease-database": {
-        // Memfile is the simplest and easiest backend to use. It's an in-memory
-        // database with data being written to a CSV file. It is very similar to
-        // what ISC DHCP does.
-        "type": "memfile"
-    },
-
-    // Let's configure some global parameters. The home network is not very dynamic
-    // and there's no shortage of addresses, so no need to recycle aggressively.
-    "valid-lifetime": 43200, // leases will be valid for 12h
-    "renew-timer": 21600, // clients should renew every 6h
-    "rebind-timer": 32400, // clients should start looking for other servers after 9h
-
-    // Kea will clean up its database of expired leases once per hour. However, it
-    // will keep the leases in expired state for 2 days. This greatly increases the
-    // chances for returning devices to get the same address again. To guarantee that,
-    // use host reservation.
-    // If both "flush-reclaimed-timer-wait-time" and "hold-reclaimed-time" are
-    // not 0, when the client sends a release message the lease is expired
-    // instead of being deleted from lease storage.
-    "expired-leases-processing": {
-        "reclaim-timer-wait-time": 3600,
-        "hold-reclaimed-time": 172800,
-        "max-reclaim-leases": 0,
-        "max-reclaim-time": 0
-    },
-
-    // HA requires two hook libraries to be loaded: libdhcp_lease_cmds.so and
-    // libdhcp_ha.so. The former handles incoming lease updates from the HA peers.
-    // The latter implements high availability feature for Kea. Note the library name
-    // should be the same, but the path is OS specific.
-    "hooks-libraries": [
-        // The lease_cmds library must be loaded because HA makes use of it to
-        // deliver lease updates to the server as well as synchronize the
-        // lease database after failure.
-        {
-            "library": "/usr/local/lib/kea/hooks/libdhcp_lease_cmds.so"
-        },
-
-        {
-            // The HA hook library should be loaded.
-            "library": "/usr/local/lib/kea/hooks/libdhcp_ha.so",
-            "parameters": {
-                // Each server should have the same HA configuration, except for the
-                // "this-server-name" parameter.
-                "high-availability": [ {
-                    // This parameter points to this server instance. The respective
-                    // HA peers must have this parameter set to their own names.
-                    "this-server-name": "s-kea1.gsb.lan",
-                    // The HA mode is set to hot-standby. In this mode, the active server handles
-                    // all the traffic. The standby takes over if the primary becomes unavailable.
-                    "mode": "hot-standby",
-                    // Heartbeat is to be sent every 10 seconds if no other control
-                    // commands are transmitted.
-                    "heartbeat-delay": 10000,
-                    // Maximum time for partner's response to a heartbeat, after which
-                    // failure detection is started. This is specified in milliseconds.
-                    // If we don't hear from the partner in 60 seconds, it's time to
-                    // start worrying.
-                    "max-response-delay": 30000,
-                    // The following parameters control how the server detects the
-                    // partner's failure. The ACK delay sets the threshold for the
-                    // 'secs' field of the received discovers. This is specified in
-                    // milliseconds.
-                    "max-ack-delay": 5000,
-                    // This specifies the number of clients which send messages to
-                    // the partner but appear to not receive any response.
-                    "max-unacked-clients": 0,
-                    // This specifies the maximum timeout (in milliseconds) for the server
-                    // to complete sync. If you have a large deployment (high tens or
-                    // hundreds of thousands of clients), you may need to increase it
-                    // further. The default value is 60000ms (60 seconds).
-                    "sync-timeout": 60000,
-                    "peers": [
-                        // This is the configuration of this server instance.
-                        {
-                            "name": "s-kea1.gsb.lan",
-                            // This specifies the URL of this server instance. The
-                            // Control Agent must run along with this DHCPv4 server
-                            // instance and the "http-host" and "http-port" must be
-                            // set to the corresponding values.
-                            "url": "http://172.16.64.20:8000/",
-                            // This server is primary. The other one must be
-                            // secondary.
-                            "role": "primary"
-                        },
-                        // This is the configuration of the secondary server.
-                        {
-                            "name": "s-kea2.gsb.lan",
-                            // Specifies the URL on which the partner's control
-                            // channel can be reached. The Control Agent is required
-                            // to run on the partner's machine with "http-host" and
-                            // "http-port" values set to the corresponding values.
-                            "url": "http://172.16.64.21:8000/",
-                            // The other server is secondary. This one must be
-                            // primary.
-                            "role": "standby"
-                        }
-                    ]
-                } ]
-            }
-        }
-    ],
-
-    // This example contains a single subnet declaration.
-    "subnet4": [
-        {
-            // Subnet prefix.
-            "subnet": "172.16.64.0/24",
-
-            // There are no relays in this network, so we need to tell Kea that this subnet
-            // is reachable directly via the specified interface.
-            "interface": "enp0s9",
-
-            // Specify a dynamic address pool.
-            "pools": [
-                {
-                    "pool": "172.16.64.100-172.16.64.150"
-                }
-            ],
-
-            // These are options that are subnet specific. In most cases, you need to define at
-            // least routers option, as without this option your clients will not be able to reach
-            // their default gateway and will not have Internet connectivity. If you have many
-            // subnets and they share the same options (e.g. DNS servers typically is the same
-            // everywhere), you may define options at the global scope, so you don't repeat them
-            // for every network.
-            "option-data": [
-                {
-                    // For each IPv4 subnet you typically need to specify at least one router.
-                    "name": "routers",
-                    "data": "172.16.64.254"
-                },
-                {
-                    // Using cloudflare or Quad9 is a reasonable option. Change this
-                    // to your own DNS servers is you have them. Another popular
-                    // choice is 8.8.8.8, owned by Google. Using third party DNS
-                    // service raises some privacy concerns.
-                    "name": "domain-name-servers",
-                    "data": "172.16.0.1"
-                }
-            ],
-
-            // Some devices should get a static address. Since the .100 - .199 range is dynamic,
-            // let's use the lower address space for this. There are many ways how reservation
-            // can be defined, but using MAC address (hw-address) is by far the most popular one.
-            // You can use client-id, duid and even custom defined flex-id that may use whatever
-            // parts of the packet you want to use as identifiers. Also, there are many more things
-            // you can specify in addition to just an IP address: extra options, next-server, hostname,
-            // assign device to client classes etc. See the Kea ARM, Section 8.3 for details.
-            // The reservations are subnet specific.
-            #"reservations": [
-            #    {
-            #        "hw-address": "1a:1b:1c:1d:1e:1f",
-            #        "ip-address": "192.168.1.10"
-            #    },
-            #    {
-            #        "client-id": "01:11:22:33:44:55:66",
-            #        "ip-address": "192.168.1.11"
-            #    }
-            #]
-        }
-    ],
-	// fichier de logs
-     "loggers": [
-     {
-        // This section affects kea-dhcp4, which is the base logger for DHCPv4 component. It tells
-        // DHCPv4 server to write all log messages (on severity INFO or higher) to a file. The file
-        // will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel
-        // (range 0 to 99) is used only when logging on DEBUG level.
-        "name": "kea-dhcp4",
-        "output_options": [
-            {
-                "output": "stdout",
-                "maxsize": 2048000,
-                "maxver": 4
-            }
-        ],
-        "severity": "INFO",
-        "debuglevel": 0
-    }
-  ]
-}
-}
--- a/roles/old/kea-master/handlers/main.yml
+++ b/roles/old/kea-master/handlers/main.yml
@ -1,18 +0,0 @@
---  
-  - name: restart isc-kea-dhcp4-server
-    service:
-      name: isc-kea-dhcp4-server.service
-      state: restarted
-      enabled: yes
-
-  - name: restart isc-kea-ctrl-agent
-    service:
-      name: isc-kea-ctrl-agent.service
-      state: restarted
-      enabled: yes
-
-  - name: restart mariadb-server
-    service:
-      name: mariadb-server
-      state: restarted
-      enabled: yes
--- a/roles/old/kea-master/tasks/main.yml
+++ b/roles/old/kea-master/tasks/main.yml
@ -1,75 +0,0 @@
---  
- name: installation des dépendances
-  apt:
-    name:
-      - liblog4cplus-2.0.5
-      - libmariadb3
-      - libpq5
-      - mariadb-common
-      - mysql-common
-    state: present
-
- name: telechargemement du paquet isc-kea-common 
-  get_url:
-    url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-common_2.4.1-isc20231123184533/isc-kea-common_2.4.1-isc20231123184533_amd64.deb" 
-    dest: "/tmp"
-    
- name: telechargement du paquet isc-kea-dhcp4
-  get_url:
-    url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-dhcp4_2.4.1-isc20231123184533/isc-kea-dhcp4_2.4.1-isc20231123184533_amd64.deb" 
-    dest: "/tmp"
-
- name: telechargement du paquet isc-kea-ctrl-agent
-  get_url:
-    url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-ctrl-agent_2.4.1-isc20231123184533/isc-kea-ctrl-agent_2.4.1-isc20231123184533_amd64.deb" 
-    dest: "/tmp"
-
- name: telechargement du  paquet isc-kea-hooks
-  get_url:
-    url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-hooks_2.4.1-isc20231123184533/isc-kea-hooks_2.4.1-isc20231123184533_amd64.deb" 
-    dest: "/tmp"
- name: Update apt
-  apt:
-    update_cache: yes
-    
- name: Installation paquet isc-kea-common
-  apt:
-    deb: "/tmp/isc-kea-common_2.4.1-isc20231123184533_amd64.deb"
-    state: present
-
-
- name: Installation isc-kea-dhcp4
-  apt:
-    deb: "/tmp/isc-kea-dhcp4_2.4.1-isc20231123184533_amd64.deb"
-    state: present
-
- name: Installation isc-kea-ctrl-agent
-  apt:
-    deb: "/tmp/isc-kea-ctrl-agent_2.4.1-isc20231123184533_amd64.deb"
-    state: present
-
- name: Installation isc-kea-hooks
-  apt:
-    deb: "/tmp/isc-kea-hooks_2.4.1-isc20231123184533_amd64.deb"
-    state: present
-
- name: Copie du repertoire des hooks dans le repertoire /usr/local/bin/kea/hooks
-  copy:
-    src: /usr/lib/x86_64-linux-gnu/kea/
-    dest: /usr/local/lib/kea/
-
- name: Copie du fichier de configuration kea-dhcp4.conf
-  copy:
-    src: kea-dhcp4.conf
-    dest: /etc/kea/kea-dhcp4.conf
-
-  notify: 
-    - restart isc-kea-dhcp4-server
-
- name: Copie du fichier de configuration kea-ctrl-agent
-  copy:
-    src: kea-ctrl-agent.conf
-    dest: /etc/kea/kea-ctrl-agent.conf
-    
-  notify:
-    - restart isc-kea-ctrl-agent
--- a/roles/old/kea-slave/README.md
+++ b/roles/old/kea-slave/README.md
@ -1,14 +0,0 @@
-# Rôle Kea
-***
-Rôle du Kea pour la haute disponibilité dhcp
-
-## Tables des matières
-    1. [Que fait le rôle Kea ?]
-
-
-## Que fait le rôle Kea ?
-Il permet de configurer les serveur kea en mode haute disponibilité.
-
-### Installation et configuration de kea
-
-Le rôle kea va installer les packets kea dhcp4, hook, admin une fois les packets installer. Nous allons configurer les 2 serveurs kea pour qu'il distribut les ip de n-user et soit en haute disponibilité.
--- a/roles/old/kea-slave/default/main.yml
+++ b/roles/old/kea-slave/default/main.yml
@ -1,8 +0,0 @@
-#variable kea
- kea_ver: "2.4.1"
-  kea_dbname: ""
-  kaa_dbuser: ""
-  kea_dbpasswd: ""
-  kea_dhcp4_dir: "/etc/kea/kea-dhcp4.conf"
-  kea_ctrl_dir: "/etc/kea/kea-ctrl-agent.conf"
-
--- a/roles/old/kea-slave/files/kea-ctrl-agent.conf
+++ b/roles/old/kea-slave/files/kea-ctrl-agent.conf
@ -1,66 +0,0 @@
-// This is an example of a configuration for Control-Agent (CA) listening
-// for incoming HTTP traffic. This is necessary for handling API commands,
-// in particular lease update commands needed for HA setup.
-{
-    "Control-agent":
-    {
-        // We need to specify where the agent should listen to incoming HTTP
-        // queries.
-        "http-host": "172.16.64.21",
-
-        // This specifies the port CA will listen on.
-        "http-port": 8000,
-
-        "control-sockets":
-        {
-            // This is how the Agent can communicate with the DHCPv4 server.
-            "dhcp4":
-            {
-                "comment": "socket to DHCPv4 server",
-                "socket-type": "unix",
-                "socket-name": "/tmp/kea4-ctrl-socket"
-            },
-
-            // Location of the DHCPv6 command channel socket.
-           # "dhcp6":
-           # {
-           #     "socket-type": "unix",
-           #     "socket-name": "/tmp/kea6-ctrl-socket"
-           # },
-
-            // Location of the D2 command channel socket.
-           # "d2":
-           # {
-           #     "socket-type": "unix",
-           #     "socket-name": "/tmp/kea-ddns-ctrl-socket",
-           #     "user-context": { "in-use": false }
-           # }
-        },
-
-        // Similar to other Kea components, CA also uses logging.
-        "loggers": [
-            {
-                "name": "kea-ctrl-agent",
-                "output_options": [
-                    {
-                        "output": "stdout",
-
-                        // Several additional parameters are possible in addition
-                        // to the typical output. Flush determines whether logger
-                        // flushes output to a file. Maxsize determines maximum
-                        // filesize before the file is rotated. maxver
-                        // specifies the maximum number of rotated files being
-                        // kept.
-                        "flush": true,
-                        "maxsize": 204800,
-                        "maxver": 4,
-                        // We use pattern to specify custom log message layout
-                        "pattern": "%d{%y.%m.%d %H:%M:%S.%q} %-5p [%c/%i] %m\n"
-                    }
-                ],
-                "severity": "INFO",
-                "debuglevel": 0 // debug level only applies when severity is set to DEBUG.
-            }
-        ]
-    }
-}
--- a/roles/old/kea-slave/files/kea-dhcp4.conf
+++ b/roles/old/kea-slave/files/kea-dhcp4.conf
@ -1,226 +0,0 @@
-// This is an example configuration of the Kea DHCPv4 server 1:
-//
-// - uses High Availability hook library and Lease Commands hook library
-//   to enable High Availability function for the DHCP server. This config
-//   file is for the primary (the active) server.
-// - uses memfile, which stores lease data in a local CSV file
-// - it assumes a single /24 addressing over a link that is directly reachable
-//   (no DHCP relays)
-// - there is a handful of IP reservations
-//
-// It is expected to run with a standby (the passive) server, which has a very similar
-// configuration. The only difference is that "this-server-name" must be set to "server2" on the
-// other server. Also, the interface configuration depends on the network settings of the
-// particular machine.
-
-{
-
-"Dhcp4": {
-
-    // Add names of your network interfaces to listen on.
-    "interfaces-config": {
-        // The DHCPv4 server listens on this interface. When changing this to
-        // the actual name of your interface, make sure to also update the
-        // interface parameter in the subnet definition below.
-        "interfaces": [ "enp0s9" ]
-    },
-
-    // Control socket is required for communication between the Control
-    // Agent and the DHCP server. High Availability requires Control Agent
-    // to be running because lease updates are sent over the RESTful
-    // API between the HA peers.
-    "control-socket": {
-        "socket-type": "unix",
-        "socket-name": "/tmp/kea4-ctrl-socket"
-    },
-
-    // Use Memfile lease database backend to store leases in a CSV file.
-    // Depending on how Kea was compiled, it may also support SQL databases
-    // (MySQL and/or PostgreSQL). Those database backends require more
-    // parameters, like name, host and possibly user and password.
-    // There are dedicated examples for each backend. See Section 7.2.2 "Lease
-    // Storage" for details.
-    "lease-database": {
-        // Memfile is the simplest and easiest backend to use. It's an in-memory
-        // database with data being written to a CSV file. It is very similar to
-        // what ISC DHCP does.
-        "type": "memfile"
-    },
-
-    // Let's configure some global parameters. The home network is not very dynamic
-    // and there's no shortage of addresses, so no need to recycle aggressively.
-    "valid-lifetime": 43200, // leases will be valid for 12h
-    "renew-timer": 21600, // clients should renew every 6h
-    "rebind-timer": 32400, // clients should start looking for other servers after 9h
-
-    // Kea will clean up its database of expired leases once per hour. However, it
-    // will keep the leases in expired state for 2 days. This greatly increases the
-    // chances for returning devices to get the same address again. To guarantee that,
-    // use host reservation.
-    // If both "flush-reclaimed-timer-wait-time" and "hold-reclaimed-time" are
-    // not 0, when the client sends a release message the lease is expired
-    // instead of being deleted from lease storage.
-    "expired-leases-processing": {
-        "reclaim-timer-wait-time": 3600,
-        "hold-reclaimed-time": 172800,
-        "max-reclaim-leases": 0,
-        "max-reclaim-time": 0
-    },
-
-    // HA requires two hook libraries to be loaded: libdhcp_lease_cmds.so and
-    // libdhcp_ha.so. The former handles incoming lease updates from the HA peers.
-    // The latter implements high availability feature for Kea. Note the library name
-    // should be the same, but the path is OS specific.
-    "hooks-libraries": [
-        // The lease_cmds library must be loaded because HA makes use of it to
-        // deliver lease updates to the server as well as synchronize the
-        // lease database after failure.
-        {
-            "library": "/usr/local/lib/kea/hooks/libdhcp_lease_cmds.so"
-        },
-
-        {
-            // The HA hook library should be loaded.
-            "library": "/usr/local/lib/kea/hooks/libdhcp_ha.so",
-            "parameters": {
-                // Each server should have the same HA configuration, except for the
-                // "this-server-name" parameter.
-                "high-availability": [ {
-                    // This parameter points to this server instance. The respective
-                    // HA peers must have this parameter set to their own names.
-                    "this-server-name": "s-kea2.gsb.lan",
-                    // The HA mode is set to hot-standby. In this mode, the active server handles
-                    // all the traffic. The standby takes over if the primary becomes unavailable.
-                    "mode": "hot-standby",
-                    // Heartbeat is to be sent every 10 seconds if no other control
-                    // commands are transmitted.
-                    "heartbeat-delay": 10000,
-                    // Maximum time for partner's response to a heartbeat, after which
-                    // failure detection is started. This is specified in milliseconds.
-                    // If we don't hear from the partner in 60 seconds, it's time to
-                    // start worrying.
-                    "max-response-delay": 30000,
-                    // The following parameters control how the server detects the
-                    // partner's failure. The ACK delay sets the threshold for the
-                    // 'secs' field of the received discovers. This is specified in
-                    // milliseconds.
-                    "max-ack-delay": 5000,
-                    // This specifies the number of clients which send messages to
-                    // the partner but appear to not receive any response.
-                    "max-unacked-clients": 0,
-                    // This specifies the maximum timeout (in milliseconds) for the server
-                    // to complete sync. If you have a large deployment (high tens or
-                    // hundreds of thousands of clients), you may need to increase it
-                    // further. The default value is 60000ms (60 seconds).
-                    "sync-timeout": 60000,
-                    "peers": [
-                        // This is the configuration of this server instance.
-                        {
-                            "name": "s-kea1.gsb.lan",
-                            // This specifies the URL of this server instance. The
-                            // Control Agent must run along with this DHCPv4 server
-                            // instance and the "http-host" and "http-port" must be
-                            // set to the corresponding values.
-                            "url": "http://172.16.64.20:8000/",
-                            // This server is primary. The other one must be
-                            // secondary.
-                            "role": "primary"
-                        },
-                        // This is the configuration of the secondary server.
-                        {
-                            "name": "s-kea2.gsb.lan",
-                            // Specifies the URL on which the partner's control
-                            // channel can be reached. The Control Agent is required
-                            // to run on the partner's machine with "http-host" and
-                            // "http-port" values set to the corresponding values.
-                            "url": "http://172.16.64.21:8000/",
-                            // The other server is secondary. This one must be
-                            // primary.
-                            "role": "standby"
-                        }
-                    ]
-                } ]
-            }
-        }
-    ],
-
-    // This example contains a single subnet declaration.
-    "subnet4": [
-        {
-            // Subnet prefix.
-            "subnet": "172.16.64.0/24",
-
-            // There are no relays in this network, so we need to tell Kea that this subnet
-            // is reachable directly via the specified interface.
-            "interface": "enp0s9",
-
-            // Specify a dynamic address pool.
-            "pools": [
-                {
-                    "pool": "172.16.64.100-172.16.64.150"
-                }
-            ],
-
-            // These are options that are subnet specific. In most cases, you need to define at
-            // least routers option, as without this option your clients will not be able to reach
-            // their default gateway and will not have Internet connectivity. If you have many
-            // subnets and they share the same options (e.g. DNS servers typically is the same
-            // everywhere), you may define options at the global scope, so you don't repeat them
-            // for every network.
-            "option-data": [
-                {
-                    // For each IPv4 subnet you typically need to specify at least one router.
-                    "name": "routers",
-                    "data": "172.16.64.254"
-                },
-                {
-                    // Using cloudflare or Quad9 is a reasonable option. Change this
-                    // to your own DNS servers is you have them. Another popular
-                    // choice is 8.8.8.8, owned by Google. Using third party DNS
-                    // service raises some privacy concerns.
-                    "name": "domain-name-servers",
-                    "data": "172.16.0.1"
-                }
-            ],
-
-            // Some devices should get a static address. Since the .100 - .199 range is dynamic,
-            // let's use the lower address space for this. There are many ways how reservation
-            // can be defined, but using MAC address (hw-address) is by far the most popular one.
-            // You can use client-id, duid and even custom defined flex-id that may use whatever
-            // parts of the packet you want to use as identifiers. Also, there are many more things
-            // you can specify in addition to just an IP address: extra options, next-server, hostname,
-            // assign device to client classes etc. See the Kea ARM, Section 8.3 for details.
-            // The reservations are subnet specific.
-            #"reservations": [
-            #    {
-            #        "hw-address": "1a:1b:1c:1d:1e:1f",
-            #        "ip-address": "192.168.1.10"
-            #    },
-            #    {
-            #        "client-id": "01:11:22:33:44:55:66",
-            #        "ip-address": "192.168.1.11"
-            #    }
-            #]
-        }
-    ],
-	// fichier de logs
-     "loggers": [
-     {
-        // This section affects kea-dhcp4, which is the base logger for DHCPv4 component. It tells
-        // DHCPv4 server to write all log messages (on severity INFO or higher) to a file. The file
-        // will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel
-        // (range 0 to 99) is used only when logging on DEBUG level.
-        "name": "kea-dhcp4",
-        "output_options": [
-            {
-                "output": "stdout",
-                "maxsize": 2048000,
-                "maxver": 4
-            }
-        ],
-        "severity": "INFO",
-        "debuglevel": 0
-    }
-  ]
-}
-}
--- a/roles/old/kea-slave/handlers/main.yml
+++ b/roles/old/kea-slave/handlers/main.yml
@ -1,18 +0,0 @@
---  
-  - name: restart isc-kea-dhcp4-server
-    service:
-      name: isc-kea-dhcp4-server.service
-      state: restarted
-      enabled: yes
-
-  - name: restart isc-kea-ctrl-agent
-    service:
-      name: isc-kea-ctrl-agent.service
-      state: restarted
-      enabled: yes
-
-  - name: restart mariadb-server
-    service:
-      name: mariadb-server
-      state: restarted
-      enabled: yes
--- a/roles/old/kea-slave/tasks/main.yml
+++ b/roles/old/kea-slave/tasks/main.yml
@ -1,75 +0,0 @@
---  
- name: installation des dépendances
-  apt:
-    name:
-      - liblog4cplus-2.0.5
-      - libmariadb3
-      - libpq5
-      - mariadb-common
-      - mysql-common
-    state: present
-
- name: telechargemement du paquet isc-kea-common 
-  get_url:
-    url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-common_2.4.1-isc20231123184533/isc-kea-common_2.4.1-isc20231123184533_amd64.deb" 
-    dest: "/tmp"
-    
- name: telechargement du paquet isc-kea-dhcp4
-  get_url:
-    url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-dhcp4_2.4.1-isc20231123184533/isc-kea-dhcp4_2.4.1-isc20231123184533_amd64.deb" 
-    dest: "/tmp"
-
- name: telechargement du paquet isc-kea-ctrl-agent
-  get_url:
-    url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-ctrl-agent_2.4.1-isc20231123184533/isc-kea-ctrl-agent_2.4.1-isc20231123184533_amd64.deb" 
-    dest: "/tmp"
-
- name: telechargement du  paquet isc-kea-hooks
-  get_url:
-    url: "https://dl.cloudsmith.io/public/isc/kea-2-4/deb/debian/pool/bookworm/main/i/is/isc-kea-hooks_2.4.1-isc20231123184533/isc-kea-hooks_2.4.1-isc20231123184533_amd64.deb" 
-    dest: "/tmp"
- name: Update apt
-  apt:
-    update_cache: yes
-    
- name: Installation paquet isc-kea-common
-  apt:
-    deb: "/tmp/isc-kea-common_2.4.1-isc20231123184533_amd64.deb"
-    state: present
-
-
- name: Installation isc-kea-dhcp4
-  apt:
-    deb: "/tmp/isc-kea-dhcp4_2.4.1-isc20231123184533_amd64.deb"
-    state: present
-
- name: Installation isc-kea-ctrl-agent
-  apt:
-    deb: "/tmp/isc-kea-ctrl-agent_2.4.1-isc20231123184533_amd64.deb"
-    state: present
-
- name: Installation isc-kea-hooks
-  apt:
-    deb: "/tmp/isc-kea-hooks_2.4.1-isc20231123184533_amd64.deb"
-    state: present
-
- name: Copie du repertoire des hooks dans le repertoire /usr/local/bin/kea/hooks
-  copy:
-    src: /usr/lib/x86_64-linux-gnu/kea/
-    dest: /usr/local/lib/kea/
-
- name: Copie du fichier de configuration kea-dhcp4.conf
-  copy:
-    src: kea-dhcp4.conf
-    dest: /etc/kea/kea-dhcp4.conf
-
-  notify: 
-    - restart isc-kea-dhcp4-server
-
- name: Copie du fichier de configuration kea-ctrl-agent
-  copy:
-    src: kea-ctrl-agent.conf
-    dest: /etc/kea/kea-ctrl-agent.conf
-    
-  notify:
-    - restart isc-kea-ctrl-agent
--- a/roles/post-lb/files/interfaces.s-lb-web2
+++ b/roles/post-lb/files/interfaces.s-lb-web2
@ -7,15 +7,15 @@ iface lo inet loopback
 # carte n-adm
 allow-hotplug enp0s3
 iface enp0s3 inet static
-	address 192.168.99.102/24
+	address 192.168.99.101/24

 # Réseau n-dmz-lb
 allow-hotplug enp0s8
 iface enp0s8 inet static
-        address 192.168.101.2/24
+        address 192.168.101.1/24

 # réseau n-dmz-db
 allow-hotplug enp0s9
 iface enp0s9 inet static
-        address 192.168.102.2/24
+        address 192.168.102.1/24
 	post-up mount -o rw 192.168.102.253:/home/wordpress /var/www/html
--- a/roles/post/files/interfaces.s-awx
+++ b/roles/post/files/interfaces.s-awx
@ -1,23 +0,0 @@
-# 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/*
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# cote n-adm
-allow-hotplug enp0s3
-iface enp0s3 inet static
-	address 192.168.99.22/24
-	gateway 192.168.99.99	 
-
-# Cote n-infra
-allow-hotplug enp0s8
-iface enp0s8 inet static
-	address 172.16.0.22/24
-	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
--- a/roles/post/files/interfaces.s-kea1
+++ b/roles/post/files/interfaces.s-kea1
@ -1,26 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# cote N-adm
-allow-hotplug enp0s3
-iface enp0s3 inet static
-	address 192.168.99.20
-	netmask 255.255.255.0
-	gateway 192.168.99.99
-	
-
-# cote N-infra
-allow-hotplug enp0s8
-iface enp0s8 inet static
-	address 172.16.0.20
-	netmask 255.255.255.0
-
-#cote N-user
-allow-hotplug enp0s9
-iface enp0s9 inet static
-	address 172.16.64.20
-	netmask 255.255.255.0
--- a/roles/post/files/interfaces.s-kea2
+++ b/roles/post/files/interfaces.s-kea2
@ -1,26 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# cote N-adm
-allow-hotplug enp0s3
-iface enp0s3 inet static
-	address 192.168.99.21
-	netmask 255.255.255.0
-	gateway 192.168.99.99
-	
-
-# cote N-infra
-allow-hotplug enp0s8
-iface enp0s8 inet static
-	address 172.16.0.21
-	netmask 255.255.255.0
-
-#cote N-user
-allow-hotplug enp0s9
-iface enp0s9 inet static
-	address 172.16.64.21
-	netmask 255.255.255.0
--- a/roles/smb-backup/files/backupnxc.sh
+++ b/roles/smb-backup/files/backupnxc.sh
@ -1,10 +0,0 @@
-#!/bin/bash
-
-# envoie sur s-backup
-BACKUP=/home/backup/s-nxc
-
-# Préparation des dossiers qui vont accueillir les données à sauvegarder (-e lance le répertoire si il existe)
-[[ -e "${BACKUP}" ]] || mkdir -p "${BACKUP}"
-
-# Sauvegarde du fichier nxc.tgz vers la machine s-backup
-scp -i ~/.ssh/id_rsa_sbackup root@s-nxc.gsb.adm:/root/nxc/nxc.tgz "${BACKUP}/"
--- a/roles/smb-backup/tasks/main.yml
+++ b/roles/smb-backup/tasks/main.yml
@ -14,14 +14,6 @@
    group: root
    mode: '0755'

- name: copie script backupnxc dans /usr/local/bin
-  copy:
-    src: backupnxc.sh
-    dest: /usr/local/bin
-    owner: root
-    group: root
-    mode: '0755'
-
 - name: crontab backupsmb ( commentee par defaut )
  cron:
    name: backupsmb
--- a/roles/ssh-backup-key-gen/README.md
+++ b/roles/ssh-backup-key-gen/README.md
@ -1 +0,0 @@
-###Génération de clé publique et privée###
--- a/roles/ssh-backup-key-gen/tasks/main.yml
+++ b/roles/ssh-backup-key-gen/tasks/main.yml
@ -1,20 +0,0 @@
---
- name: on genere une cle privee pour s-backup
-  openssh_keypair:
-    path: /root/id_rsa_sbackup
-    type: rsa
-    state: present
-
- name: copie cle publique dans gsbstore
-  copy:
-    src: /root/id_rsa_sbackup.pub
-    dest: /var/www/html/gsbstore
-    mode: 0644
-    remote_src: yes
-
- name: copie cle privee dans gsbstore
-  copy:
-    src: /root/id_rsa_sbackup
-    dest: /var/www/html/gsbstore
-    mode: 0600
-    remote_src: yes
--- a/roles/ssh-backup-key-private/tasks/main.yml
+++ b/roles/ssh-backup-key-private/tasks/main.yml
@ -1,13 +0,0 @@
---
- name: creation .ssh
-  file:
-    path: ~/.ssh
-    state: directory
-    mode: 0700
-
- name: recuperation de la cle privee generee par s-adm
-  get_url:
-    url: http://s-adm.gsb.adm/gsbstore/id_rsa_sbackup
-    dest: /root/.ssh/id_rsa_sbackup
-    mode: 0600
-
--- a/roles/ssh-backup-key-pub/tasks/main.yml
+++ b/roles/ssh-backup-key-pub/tasks/main.yml
@ -1,6 +0,0 @@
---
- name: recuperation de la cle publique generee par s-adm
-  ansible.posix.authorized_key:
-    user: root
-    state: present
-    key: http://s-adm.gsb.adm/gsbstore/id_rsa_sbackup.pub
--- a/roles/stork-agent/README.md
+++ b/roles/stork-agent/README.md
@ -1,21 +0,0 @@
-# Rôle Kea
-***
-Rôle Kea: Configuration de 2 serveurs KEA en mode haute disponbilité.
-
-## Tables des matières
-    1. [Que fait le rôle Kea ?]
-    2. [Installation et configuration de ka]
-    3. [Remarques]
-
-
-## Que fait le rôle Kea ?
-Le rôle KEA permet de configurer 1  serveurs kea (s-kea1 et s-kea2) en mode haute disponibilité.
- Le serveur **s-kea1** sera en mode **primary** il délivrera les baux DHCP sur le réseau n-user.
- Le serveur **s-kea2**, sera en mode **stand-by** le service DHCP basculera donc sur **s-kea2** en cas disponibilité du serveur**s-kea1**. 
-
-### Installation et configuration de kea
-
-Le rôle kea installe les packets **kea dhcp4, hooks, admin** une fois les packets installer. Il configure un  serveur kea pour qu'il distribue les ips sur le réseau n-user et soit en haute disponibilité.
-
-### Remarquees ###
-Une fois le playbook **s-kea** correctement terminé et la machine **s-kea** redemarrée, redémarrée le service **isc-kea-dhcp4.service** afin de prendre en compte les modifications éfféctuées sur la couche réseau par le role POST.
--- a/roles/stork-agent/handlers/main.yml
+++ b/roles/stork-agent/handlers/main.yml
@ -1,7 +0,0 @@
---  
- name: Restart isc-stork-agent
-  ansible.builtin.service:
-    name: isc-stork-agent.service
-    state: restarted
-    enabled: yes
-
--- a/roles/stork-agent/tasks/main.yml
+++ b/roles/stork-agent/tasks/main.yml
@ -1,21 +0,0 @@
---  
-
- name: Preparation  
-  ansible.builtin.shell: curl -1sLf 'https://dl.cloudsmith.io/public/isc/stork/cfg/setup/bash.deb.sh' | sudo bash 
-
- name: Update apt
-  ansible.builtin.apt:
-    update_cache: yes
-
- name: Installation isc-stork-agent
-  ansible.builtin.apt:
-    name: isc-stork-agent
-    state: present
-
- name: Generation du fichier de configuration agent.env
-  ansible.builtin.template:
-    src: agent.env.j2
-    dest: /etc/stork/agent.env
-  notify:
-    - Restart isc-stork-agent
-
--- a/roles/stork-agent/templates/agent.env.j2
+++ b/roles/stork-agent/templates/agent.env.j2
@ -1,45 +0,0 @@
-### the IP or hostname to listen on for incoming Stork server connections
-STORK_AGENT_HOST={{ stork_host }}
-
-### the TCP port to listen on for incoming Stork server connections
-STORK_AGENT_PORT={{ stork_port }}
-
-### listen for commands from the Stork server only, but not for Prometheus requests
-# STORK_AGENT_LISTEN_STORK_ONLY=true
-
-### listen for Prometheus requests only, but not for commands from the Stork server
-# STORK_AGENT_LISTEN_PROMETHEUS_ONLY=true
-
-### settings for exporting stats to Prometheus
-### the IP or hostname on which the agent exports Kea statistics to Prometheus
-# STORK_AGENT_PROMETHEUS_KEA_EXPORTER_ADDRESS=
-### the port on which the agent exports Kea statistics to Prometheus
-# STORK_AGENT_PROMETHEUS_KEA_EXPORTER_PORT=
-### how often the agent collects stats from Kea, in seconds
-# STORK_AGENT_PROMETHEUS_KEA_EXPORTER_INTERVAL=
-## enable or disable collecting per-subnet stats from Kea
-# STORK_AGENT_PROMETHEUS_KEA_EXPORTER_PER_SUBNET_STATS=true
-### the IP or hostname on which the agent exports BIND 9 statistics to Prometheus
-# STORK_AGENT_PROMETHEUS_BIND9_EXPORTER_ADDRESS=
-### the port on which the agent exports BIND 9 statistics to Prometheus
-# STORK_AGENT_PROMETHEUS_BIND9_EXPORTER_PORT=
-### how often the agent collects stats from BIND 9, in seconds
-# STORK_AGENT_PROMETHEUS_BIND9_EXPORTER_INTERVAL=
-
-### Stork Server URL used by the agent to send REST commands to the server during agent registration
-STORK_AGENT_SERVER_URL=http://s-backup.gsb.lan:8080/
-
-### skip TLS certificate verification when the Stork Agent connects
-### to Kea over TLS and Kea uses self-signed certificates
-# STORK_AGENT_SKIP_TLS_CERT_VERIFICATION=true
-
-
-### Logging parameters
-
-### Set logging level. Supported values are: DEBUG, INFO, WARN, ERROR
-# STORK_LOG_LEVEL=DEBUG
-### disable output colorization
-# CLICOLOR=false
-
-### path to the hook directory
-# STORK_AGENT_HOOK_DIRECTORY=
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
root	c78e135cb6	modification roles glpi	2024-01-11 11:18:53 +01:00
root	6902c40779	mise a jour role glpi	2024-01-11 09:44:41 +01:00
				`@ -1 +0,0 @@`
				`###Génération de clé publique et privée###`