Fix xmpp notification

1. Properly call xmppc from notify-messages.xmpp
2. Move notification about successful backup after
   drive unmounting,

diff --git a/backup b/backup
index fad452ecbc3f6b1753bf9be895b71577cbbf49f6..f2eeb5144f7f9d0b660b6d1fd89c3d7bbb9516a7 100755 (executable)
--- a/backup
+++ b/backup
@@ -101,7 +101,6 @@ while (@levels) {
 }
 
 run_rsnapshot($level); 
-notify("Backup to disk $disk_id completed successfully\n");
 # Размонтируем файловую систему, содержащую snapshot_root
 
 $device =~ s/\d$//; # remove partition number 
@@ -121,6 +120,7 @@ for $device (@to_umount) {
     }
 }
 
+notify("Backup to disk $disk_id completed successfully\n");
 if (@baddevs) {
   notify("Cannot unmount device(s) ".join(", ",@baddevs).".\n")
 }

diff --git a/notify-messenger.xmpp b/notify-messenger.xmpp
index a616dd7837e0b3c733363cb5bce0fdc8e07a8019..c5685c851deaccf8381ba7a49d780e175c96e3d3 100755 (executable)
--- a/notify-messenger.xmpp
+++ b/notify-messenger.xmpp
@@ -5,5 +5,8 @@
 # configured in root's
 # ~/.config/xmppc.conf
 # should be renamed to just notify-messenger to use.
+
+# XMPP user to notifty
+ADMIN=vitus@wagner.pp.ru
 read -r message
-xmppc -m message chat vitus@wagner.pp.ru "$message"
+xmppc -m message chat $ADMIN "$message"