Allow setting more defaults in backup-script.conf

The following variables can be used in backup-script.conf now:

 pre_exec
 post_exec
 default_target
 default_user
 default_ssh_args_add
 default_rsync_args_add
 default_compress
 default_ping
 default_local

diff --git a/bin/backup-script b/bin/backup-script
index de4acca59e6b80611d6e477a97c2f3792d54acc9..ba26e7baad655c0e258f52e468048e4c041c9490 100755 (executable)
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -25,10 +25,17 @@ declare -i count_ok=0
 declare -i count_ok_vanished=0
 
 destinations=""
+
+# Default settings, can be overwritten in backup-script.conf:
 pre_exec=""
 post_exec=""
 default_target=""
 default_user="root"
+default_ssh_args_add=""
+default_rsync_args_add=""
+default_compress=1
+default_ping=1
+default_local=0
 
 Usage() {
        echo "Usage: $NAME [<options>] [<system> [<system> [...]]]"
@@ -148,21 +155,22 @@ for f in $sys; do
        [ -r "$f" -a -f "$f" ] || continue
 
        system=`basename $f`
-       user="$default_user"
-       target="$default_target"
-       ssh_args_add=""
-       rsync_args_add=""
-       compress=1
-       ping=1
-       local=0
-
        case "$system" in
                "backup-script.conf"|*.sh)
                        continue
                        ;;
        esac
 
-       # Read in configuration file
+       # Set global defaults
+       user="$default_user"
+       target="$default_target"
+       ssh_args_add="$default_ssh_args_add"
+       rsync_args_add="$default_rsync_args_add"
+       compress="$default_compress"
+       ping="$default_ping"
+       local="$default_local"
+
+       # Read in system configuration file
        source "$f"
 
        [ "$local" -eq 0 ] \