rdiff and dup handlers/helpers/examples symlink and globbing support enhancement

[matthijs/upstream/backupninja.git] / handlers / rdiff.helper

diff --git a/handlers/rdiff.helper b/handlers/rdiff.helper
index 80340f7ddaa81a5bfde636a977e480f35c201432..904ac98887555826ec69126dca6297475f9d8b96 100644 (file)
--- a/handlers/rdiff.helper
+++ b/handlers/rdiff.helper
@@ -269,6 +269,14 @@ do_rdiff_finish() {
 [source]
 type = local
 keep = $rdiff_keep
+
+# A few notes about includes and excludes:
+#   - include, exclude and vsinclude statements support EITHER globbing with '*'
+#     OR symlinks in the path; usage of both in the same statement is *not*
+#     supported and will lead to weird behaviour.
+#   - All the excludes come after all the includes. The order is not otherwise
+#     taken into account.
+
 EOF
    ## includes ##
    if [ "$host_or_vservers" == host -o "$host_or_vservers" == both ]; then
@@ -289,17 +297,17 @@ EOF
 # vsinclude = <path>
 # ...
 # Any path specified in vsinclude is added to the include list for each vserver
-# listed in vsnames (or all if vsnames = all).
+# listed in vsnames (or all if vsnames = all, which is the default).
 #
-# For example, vsinclude = /home will backup the /home partition in every 
-# vserver listed in vsnames. If you have vsnames = "foo bar baz", this
-# vsinclude will add to the include list /vservers/foo/home, 
-# /vservers/bar/home and /vservers/baz/home.
-# Vserver paths are derived from $VROOTDIR.
+# For example, vsinclude = /home will backup the /home directory in every
+# vserver listed in vsnames. If you have 'vsnames = foo bar baz', this
+# vsinclude will add to the include list /vservers/foo/home, /vservers/bar/home
+# and /vservers/baz/home.
+# Vservers paths are derived from $VROOTDIR.
 
 EOF
       set -o noglob
-      echo -e "vsnames = \"$selected_vservers\"\n" >> $next_filename
+      echo -e "vsnames = $selected_vservers\n" >> $next_filename
       for i in $rdiff_vsincludes; do
          echo "vsinclude = $i" >> $next_filename
       done
@@ -374,7 +382,7 @@ rdiff_wizard() {
    # Global variables whose '*' shall not be expanded
    set -o noglob
    rdiff_includes=(/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*)
-   rdiff_excludes=(/home/*/.gnupg)
+   rdiff_excludes=(/home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads)
    rdiff_vsincludes=
    set +o noglob