X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup.helper;h=e1d481ab197d7b1f03db4eda5d73616b4c8e62a9;hb=e39338a4d07ec0fae39e38555b5b3881a8f5fbbc;hp=1ae6581efe3e0ee700c9897a71d39241f3cfd998;hpb=0d606253af6ecb8ede07b0991a1f295fb70e7e65;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/dup.helper b/handlers/dup.helper
index 1ae6581..e1d481a 100644
--- a/handlers/dup.helper
+++ b/handlers/dup.helper
@@ -1,4 +1,5 @@
 # -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
+
 HELPERS="$HELPERS dup:incremental_encrypted_remote_filesystem_backup"
 
 ### Functions
@@ -32,7 +33,7 @@ do_dup_vserver() {
    # choose the files to backup
    REPLY=
    while [ -z "$REPLY" ]; do
-      formBegin "$dup_title - vservers: includes"
+      formBegin "$dup_title - vservers: vsincludes (backup these directories from every selected vserver)"
          [ -z "$dup_vsincludes" ] && dup_vsincludes="$dup_default_includes"
          for i in $dup_vsincludes; do
             formItem include "$i"
@@ -184,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
@@ -206,10 +207,10 @@ do_dup_gpg() {
 	 [ $? = 0 ] || return 1
    elif [ "$dup_gpg_sign" == "yes" ]; then
       if [ -z "$dup_gpg_signkey" ]; then
-	 do_dup_gpg_passphrase "unlock the GnuPG 0x$dup_gpg_signkey key used to sign the backups"
+	 do_dup_gpg_passphrase "unlock the GnuPG key used to sign the backups"
 	 [ $? = 0 ] || return 1
       else
-	 do_dup_gpg_passphrase "unlock the GnuPG 0x$dup_gpg_encryptkey key used to sign the backups"
+	 do_dup_gpg_passphrase "unlock the GnuPG key used to sign the backups"
 	 [ $? = 0 ] || return 1
       fi
    fi
@@ -350,19 +351,23 @@ EOF
 # be used:
 # vsnames = all | <vserver1> <vserver2> ... (default = all)
 # vsinclude = <path>
+# vsinclude = <path>
+# ...
 # Any path specified in vsinclude is added to the include list for each vserver
-# listed in vsnames (or all if vsnames = all).
-# E.g. 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.
+# 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
 
    if [ "$host_or_vservers" == vservers -o "$host_or_vservers" == both ]; then
       set -o noglob
-      echo -e "vsnames = \"$selected_vservers\"\n" >> $next_filename
+      echo -e "vsnames = $selected_vservers\n" >> $next_filename
       for i in $dup_vsincludes; do
          echo "vsinclude = $i" >> $next_filename
       done
@@ -503,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