modif save

pre/inst-depl

@@ -11,7 +11,7 @@ GITPRJ=gsb2024
 apt-get update 
 apt-get install -y lighttpd 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"
@@ -50,12 +50,6 @@ str84="wget -nc -4 https://artifacts.elastic.co/downloads/beats/metricbeat/metri
 
 (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}
@@ -78,7 +72,6 @@ ${str81}
 ${str82} 
 ${str83} 
 ${str84} 
-wget -nc -4 "${SRC}/zabbix.sql.gz" -O zabbix.sql.gz
 
 EOT
 )

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}/"

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

roles/zabbix-srv/tasks/main.yml

@@ -29,54 +29,41 @@
       name: mariadb
       state: started
 
-  - name: 6. Creer un utilisateur et  lui attribuer tous les droits
+  - name: 6. Modifier la variable trust function creators pour importer la base données
-    community.mysql.mysql_user:
-      name: zabbix
-      password: password
-      priv: '*.*:ALL,GRANT'
-      state: present
-      login_unix_socket: /var/run/mysqld/mysqld.sock
-
-  - name: 7. Modifier la variable trust function creators pour importer la base données
     community.mysql.mysql_variables:
       variable: log_bin_trust_function_creators
       value: 1
       mode: global
       login_unix_socket: /var/run/mysqld/mysqld.sock
 
-  - name: 8. Récupérer la base de données
+  - name: 7. Importer la base de données
-    get_url:
-      url: http://s-adm.gsb.adm/gsbstore/zabbix.sql.gz
-      dest: /tmp
-
-  - name: 9. Importer la base de données
     community.mysql.mysql_db:
       state: import
       name: zabbix
       encoding: utf8mb4
-      target: /tmp/zabbix.sql.gz
+      target: http://s-adm.gsb.adm/gsbstore/zabbix.sql.gz
       login_unix_socket: /var/run/mysqld/mysqld.sock
 
-  - name: 10. Remettre a zero la variable trust function creators
+  - name: 8. Remettre a zero la variable trust function creators
     community.mysql.mysql_variables:
       variable: log_bin_trust_function_creators
       value: 0
       mode: global
       login_unix_socket: /var/run/mysqld/mysqld.sock
 
-  - name: 11. Lancer le service zabbix-server
+  - name: 9. Lancer le service zabbix-server
     service:
      name: zabbix-server
      state: restarted
      enabled: yes
 
-  - name: 12. Lancer le service zabbix-agent
+  - name: 10. Lancer le service zabbix-agent
     service:
      name: zabbix-agent
      state: restarted
      enabled: yes
 
-  - name: 13. Lancer le service apache2
+  - name: 11. Lancer le service apache2
     service:
      name: apache2
      state: restarted