X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup.helper;h=81c6ad1290b912a7c882cecc5b39e91216b69525;hb=cb0d7cbdb0d31edf3db9788e3cc0b28b2fd5cbc2;hp=f2413344f00fbb733a66808a00a377167730c330;hpb=a99d05982d166c4bc455ef56773e93b8a558801f;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/dup.helper b/handlers/dup.helper index f241334..81c6ad1 100644 --- a/handlers/dup.helper +++ b/handlers/dup.helper @@ -185,7 +185,7 @@ do_dup_gpg_passphrase() { do_dup_gpg() { # symmetric or public key encryption ? - booleanBox "$dup_title - GnuPG" "Use public key encryption? Else, symmetric encryption will be used, and data signing will be impossible." "$dup_gpg_asymmetric_encryption" + booleanBox "$dup_title - GnuPG" "Use public key encryption? Otherwise, symmetric encryption will be used, and data signing will be impossible." "$dup_gpg_asymmetric_encryption" if [ $? = 0 ]; then dup_gpg_asymmetric_encryption=yes else @@ -354,13 +354,14 @@ EOF # vsinclude = # ... # 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 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. +# vsinclude supports globbing with '*'. EOF @@ -507,7 +508,7 @@ dup_wizard() { # Global variables whose '*' shall not be expanded set -o noglob dup_default_includes="/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*" - dup_default_excludes="/home/*/.gnupg" + dup_default_excludes="/home/*/.gnupg /home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads" set +o noglob dup_main_menu