modif fog

install-fog.yml

@@ -0,0 +1,13 @@
+---
+- hosts: localhost
+  connection: local
+
+  roles:
+    #    - base
+    #    - goss
+    # - dhcp-fog
+    #- ssh-cli
+    #- snmp-agent
+    # - syslog-cli
+    - fog
+      #- post

roles/base/tasks/main.yml

@@ -74,3 +74,9 @@
     - net.ipv6.conf.all.disable_ipv6
     - 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

roles/fog/files/fogsettings

@@ -2,8 +2,8 @@
 ## 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.9
+## Version: 1.5.10
-## Install time: jeu. 26 janv. 2023 11:41:05
+## Install time: jeu. 11 janv. 2024 11:41:05
 ipaddress='172.16.64.16'
 copybackold='0'
 interface='enp0s9'

roles/glpi/defaults/main.yml

@@ -1,6 +1,15 @@
+#variable depl
 depl_url: "http://s-adm.gsb.adm/gsbstore"
 #depl_glpi: "glpi-9.5.6.tgz"
-depl_glpi: "glpi-10.0.6.tgz"
+depl_glpi: "glpi-10.0.11.tgz"
 #depl_fusioninventory: "fusioninventory-9.5+3.0.tar.bz2"
-depl_glpi_agentx64: "GLPI-Agent-1.4-x64.msi"
+depl_glpi_agentx64: "GLPI-Agent-1.7-x64.msi"
-depl_glpi_agentx86: "GLPI-Agent-1.4-x86.msi"
+
+  #variables glpi 
+glpi_version: "10.0.11"
+glpi_dir: "/var/www/html/glpi"
+glpi_dbhost: "127.0.0.1"
+glpi_dbname: "glpi"
+glpi_dbuser: "glpi"
+glpi_dbpasswd: "glpi"
+glpi_cli: "/var/www/html/glpicli"

roles/glpi/files/dbdump

@@ -1,4 +0,0 @@
-#!/bin/sh
-chm="/var/www/html/glpi/files/_dumps"
-# Dump base GLPI
-mysqldump -uroot -proot glpi |gzip > $chm/$(date +%Y-%m-%d).sql.gz

roles/glpi/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
   - name: restart php-fpm
-    service: name=php7.0-fpm state=restarted
+    service: name=php8.2-fpm state=restarted
 
   - name: restart nginx
     service: name=nginx state=restarted

roles/glpi/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
   - name: Installation des paquets
     apt:
-      state: latest
+      state: present
       name:
       - nginx
       - php-fpm
@@ -24,10 +24,10 @@
       - postfix
       - mailutils
 
-  - name: Changement listen dans le fichier conf de php7.3
+  - name: Changement listen dans le fichier conf de php8.2
     replace:
-      dest: /etc/php/7.4/fpm/pool.d/www.conf
+      dest: /etc/php/8.2/fpm/pool.d/www.conf
-      regexp: 'listen = /run/php/php7.4-fpm.sock'
+      regexp: 'listen = /run/php/php8.2-fpm.sock'
       replace: 'listen = 127.0.0.1:9000'
       backup: yes
 
@@ -41,9 +41,12 @@
       src: block.j2 
       dest: /etc/nginx/sites-enabled/glpi
 
+    notify:
+      - restart nginx
+
   - name: Remplacement dans le fichier de conf php du timeout
     replace:
-      dest: /etc/php/7.4/fpm/php.ini
+      dest: /etc/php/8.2/fpm/php.ini
       regexp: 'max_execution_time = 30'
       replace: 'max_execution_time = 600'
       backup: yes
@@ -112,9 +115,9 @@
 #      dest: /var/www/html/glpi/plugins
 #      remote_src: yes
 
-  - name: Creation de ficlient
+  - name: Creation de glpicli
     file:
-      path: /var/www/html/ficlients
+      path: "{{ glpi_cli }}"
       state: directory
       owner: www-data
       group: www-data
@@ -130,21 +133,19 @@
   - name: Installation de GLPI Agent windows x64
     get_url:
       url: "{{ depl_url }}/{{ depl_glpi_agentx64 }}"
-      dest: "/var/www/html/ficlients"
+      dest: "{{ glpi_cli }}"
 
-#  - name: Installation de GLPI Agent windows x86
+    notify:
-#    get_url:
+      - restart nginx
-#      url: "{{ depl_url }}/{{ depl_glpi_agentx86 }}"
-#      dest: "/var/www/html/ficlients"
 
-  - name: Copie du script dbdump
+  - name: lancer la commande de création de la base de donnees glpi
-    copy: 
+    ansible.builtin.shell: php bin/console database:install -f -n 
-      src: dbdump 
+    args:
-      dest: /root/
+      chdir: "{{ glpi_dir }}" 
-
-  - name: chmod de dbdump
-    shell: chmod +x /root/dbdump
 
+  - debug:
+      msg: "base de donnees de glpi creer"
+  
   - debug:
       msg: "Redemarrez le serveur GLPI"
 

roles/glpi/templates/block.j2

@@ -16,7 +16,7 @@ server {
                 fastcgi_param SERVER_NAME $host;
   	 }
 
-	location /ficlients {
+	location /glpicli {
 		root /var/www/html;
 		autoindex on;
 	}

roles/zabbix-cli/README.md

@@ -1,13 +1,13 @@
-# Rôle nagios
+# Rôle Zabbix client
 ***
-Rôle Nagios pour la supervision des différentes machines
+Rôle du Zabbix client pour la supervision des différentes machines en active
 
 ## Tables des matières
     1. [Que fait le rôle Zabbix ?]
 
 
-## Que fait le rôle Nagios ?
+## Que fait le rôle Zabbix ?
-Il permet de configurer les agents zabbix en active.
+Il permet de configurer les agents zabbix en active sur le serveur à définir dans defaults.
 
 ### Installation et configuration de Zabbix-agent
 

roles/zabbix-cli/defaults/main.yml

@@ -1,6 +0,0 @@
-PidFile: "/run/zabbix/zabbix_agentd.pid"
-LogFile: "/var/log/zabbix/zabbix_agentd.log"
-LogFileSize: "0"
-Server: "127.0.0.1"
-ServerActive: "192.168.99.106"
-Include: "/etc/zabbix/zabbix_agentd.d/*.conf"

roles/zabbix-cli/handlers/main.yml

@@ -1,12 +1,5 @@
-  - name: config
+ - name: restart zabbix agent
-    template:
+   service:
-      src: zabbix_agentd.conf.temp
+     name: zabbix-agent
-      dest: /etc/zabbix/zabbix_agentd.conf
+     state: restarted
-    vars:
+     enabled: yes
-      PidFile: "{{ PidFile }}"
-      LogFile: "{{ LogFile }}"
-      LogFileSize: "{{ LogFileSize }}"
-      Server: "{{ Server }}"
-      ServerActive: "{{ ServerActive }}"
-      Hostname: "{{ ansible_hostname }}"
-      Include: "{{ Include }}"

roles/zabbix-cli/tasks/main.yml

@@ -1,7 +1,7 @@
     - name: Intallation paquet zabbix agent
       get_url:
-        url: "https://repo.zabbix.com/zabbix/6.4/debian/pool/main/z/zabbix-release/zabbix-release_6.4-1+debian12_all.deb"
+        url: "https://repo.zabbix.com/zabbix/6.4/debian/pool/main/z/zabbix-release/zabbix-release_6.4-1+debian12_all.deb" 
-        dest: "/tmp/zabbix-release_6.4-1+debian12_all.deb"
+        dest: "/tmp"
 
     - name: Intallation paquet zabbix agent suite
       apt:
@@ -20,10 +20,23 @@
     - name: Enable Zabbix agent service
       systemd:
         name: zabbix-agent
+        state: restarted
         enabled: yes
-
+        
     - name: Rm package
       file:
         path: "/tmp/zabbix-release_6.4-1+debian12_all.deb"
         state: absent
 
+    - name: config
+      template:
+        src: zabbix_agentd.conf.temp
+        dest: /etc/zabbix/zabbix_agentd.conf
+      vars:
+        PidFile: "/run/zabbix/zabbix_agentd.pid"
+        LogFile: "/var/log/zabbix/zabbix_agentd.log"
+        LogFileSize: "0"
+        Server: "127.0.0.1"
+        ServerActive: "s-mon.gsb.adm"
+        Hostname: "{{ ansible_hostname }}"
+        Include: "/etc/zabbix/zabbix_agentd.d/*.conf"

roles/zabbix-srv/README.md

@@ -1,12 +1,12 @@
-# Rôle nagios
+# Rôle Zabbix
 ***
-Rôle Nagios pour la supervision des différentes machines
+Rôle Zabbix pour la supervision des différentes machines
 
 ## Tables des matières
     1. [Que fait le rôle Zabbix ?]
 
 
-## Que fait le rôle Nagios ?
+## Que fait le rôle Zabbix ?
 
 
 ### Installation et configuration de Zabbix

roles/zabbix-srv/tasks/main.yml

@@ -68,11 +68,20 @@
      regexp: '^# DBPassword='
      replace: 'DBPassword=password'
 
-  - name: 12. Lancer le service zabbix
+  - name: 12. Lancer le service zabbix-server
     service:
-     name: 
+     name: zabbix-server
-       - zabbix-server
+     state: restarted
-       - zabbix-agent
+     enabled: yes
-       - apache2
+
+  - name: 13. Lancer le service zabbix-agent
+    service:
+     name: zabbix-agent
+     state: restarted
+     enabled: yes
+
+  - name: 14. Lancer le service apache2
+    service:
+     name: apache2
      state: restarted
      enabled: yes

s-fog.yml

@@ -9,5 +9,5 @@
     - ssh-cli
     - snmp-agent
     # - syslog-cli
-    - fog
+    #    - fog
     - post

s-infra.yml

@@ -4,10 +4,10 @@
   #  include: config.yml
   roles:
     - base
-    - goss
+    - zabbix-cli 
+    - goss  
     - dns-master
     - webautoconf
-    - zabbix-cli
     - journald-snd
     - ssh-cli
     - post

s-itil.yml

@@ -2,13 +2,13 @@
 - hosts: localhost
   connection: local
 
-  vars:
+    #vars:
-    glpi_version: "10.0.6"
+    #glpi_version: "10.0.11"
-    glpi_dir: "/var/www/html/glpi"
+    #glpi_dir: "/var/www/html/glpi"
-    glpi_dbhost: "127.0.0.1"
+    #glpi_dbhost: "127.0.0.1"
-    glpi_dbname: "glpi"
+    #glpi_dbname: "glpi"
-    glpi_dbuser: "glpi"
+    #glpi_dbuser: "glpi"
-    glpi_dbpasswd: "glpi"
+    #glpi_dbpasswd: "glpi"
 
   roles:
     - base