modif backup.sh

roles/s-backup/files/backup.sh

@@ -6,22 +6,22 @@ SWIN=/tmp/s-win
 [ -d "${BDIR}" ] || mkdir "${BDIR}/s-win"
 [ -d "${SWIN}" ] || mkdir "${SWIN}"
 
-mount -t cifs -o ro,vers3.0,username=u-backup,password=Azerty1+ //s-win/commun "{SWIN}"
+mount -t cifs -o ro,vers=3.0,username=u-backup,password=Azerty1+ //s-win/commun "${SWIN}"
 if [ $? != 0 ] ; then
-	echo "$0 : erreur montage"
+	echo "$0 : erreur montage ${SWIN}"
 	exit 1
 fi
-rsync -av "${SWIN}"/ /home/backup/s-win/commun
+rsync -av "${SWIN}/" "${BDIR}/s-win/commun"
 umount "${SWIN}"
 
 
-mount -t cifs -o ro,vers3.0,username=u-backup,password=Azerty1+ //s-win/public "${SWIN}"
+mount -t cifs -o ro,vers=3.0,username=u-backup,password=Azerty1+ //s-win/public "${SWIN}"
 if [ $? != 0 ] ; then
 	echo "$0 : erreur montage"
 	exit 2
 fi
-rsync -av "{SWIN}"/ /home/backup/s-win/public
-umount "{SWIN}"
+rsync -av "${SWIN}/" "${BDIR}/s-win/public"
+umount "${SWIN}"
 
 exit 0
 

s-mon.yml

@@ -5,7 +5,7 @@
   roles:
     - base
     - goss
-    - icinga-fk
+    - icinga
     - postfix
     - ssh-cli
     - syslog