modif inst-depl pour zabbix.sql.gz et SRC

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,6 +50,12 @@ 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}
@@ -72,6 +78,7 @@ ${str81}
 ${str82} 
 ${str83} 
 ${str84} 
+wget -nc -4 "${SRC}/zabbix.sql.gz" -O zabbix.sql.gz
 
 EOT
 )

roles/nxc-traefik/files/savenextcloud.sh

@@ -18,12 +18,5 @@ 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
 
-# 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 root@s-nxc:/root/nxc/nxc.tgz "${BACKUP}/"
 

roles/smb-backup/files/backupnxc.sh

@@ -0,0 +1,10 @@
+#!/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,6 +14,14 @@
     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/ssh-backup-key-private/tasks/main.yml

@@ -3,10 +3,11 @@
   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: 0644
+    mode: 0600
 

roles/zabbix-srv/tasks/main.yml

@@ -29,41 +29,54 @@
       name: mariadb
       state: started
 
-  - name: 6. Modifier la variable trust function creators pour importer la base données
+  - name: 6. Creer un utilisateur et  lui attribuer tous les droits
+    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: 7. Importer la base de données
+  - name: 8. Récupérer 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: http://s-adm.gsb..adm/gsbstore/zabbix.sql.gz
+      target: /tmp/zabbix.sql.gz
       login_unix_socket: /var/run/mysqld/mysqld.sock
 
-  - name: 8. Remettre a zero la variable trust function creators
+  - name: 10. 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: 9. Lancer le service zabbix-server
+  - name: 11. Lancer le service zabbix-server
     service:
      name: zabbix-server
      state: restarted
      enabled: yes
 
-  - name: 10. Lancer le service zabbix-agent
+  - name: 12. Lancer le service zabbix-agent
     service:
      name: zabbix-agent
      state: restarted
      enabled: yes
 
-  - name: 11. Lancer le service apache2
+  - name: 13. Lancer le service apache2
     service:
      name: apache2
      state: restarted

s-backup.yml

@@ -4,7 +4,7 @@
   vars:
     stork_db_user: "stork-server"
     stork_db_passwd: "Azerty1+"
-    stork_db_name: "stork" 
+    stork_db_name: "stork"
 
   roles:
     - base