Get full node hostname on sync-backups

diff --git a/files/sync-backups b/files/sync-backups
index 230ce1eb0ffdba3083837160adef93add7de058a..cb40c7788d8284262faaf3f83761d9fe73b8b580 100644 (file)
--- a/files/sync-backups
+++ b/files/sync-backups
@@ -10,14 +10,20 @@ IMAGES="/var/data/crypt/"
 RSYNC="nice -n 19 rsync -avH --delete --bwlimit=$BWLIMIT"
 
 if [ ! -z "$NODE" ]; then
+  # Get full node hostname.
+  NODE_HOSTNAME="`cat /var/vservers/$NODE/etc/hostname`"
+  if [ -z "$NODE_HOSTNAME" ]; then
+    NODE_HOSTNAME="$NODE"
+  fi
+
   # Sync local encrypted backup.
-  mkdir -p /$MEDIA/$NODE/duplicity
-  $RSYNC /var/vservers/$NODE/var/backups/duplicity/ /$MEDIA/$NODE/duplicity/
+  mkdir -p /$MEDIA/$NODE_HOSTNAME/duplicity
+  $RSYNC /var/vservers/$NODE/var/backups/duplicity/ /$MEDIA/$NODE_HOSTNAME/duplicity/
 
   # Sync remote backups.
   for node in `ls /var/vservers/$NODE/var/backups/remote/`; do
-    mkdir -p /$MEDIA/$NODE/remote/$node
-    $RSYNC /var/vservers/$NODE/var/backups/remote/$node/ /$MEDIA/$NODE/remote/$node/
+    mkdir -p /$MEDIA/$NODE_HOSTNAME/remote/$node
+    $RSYNC /var/vservers/$NODE/var/backups/remote/$node/ /$MEDIA/$NODE_HOSTNAME/remote/$node/
   done
 else
   # Sync local encrypted backup.