From 8f5e485d45629008684027f214a490d007965ef0 Mon Sep 17 00:00:00 2001 From: Ducky Date: Wed, 23 Feb 2022 05:14:53 +0000 Subject: [PATCH] various changes --- .gitignore | 9 +++++++++ usr/local/sbin/zio-backup | 9 ++++++++- var/zio-backup/passwd | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 var/zio-backup/passwd diff --git a/.gitignore b/.gitignore index f48dd23..5589d50 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,12 @@ /usr/local/sbin/* !/usr/local/sbin/update-rootfs !/usr/local/sbin/zio-backup + +# /var/ +!/var/ +/var/* + +# /var/zio-backup/ +!/var/zio-backup/ +/var/zio-backup/* +!/var/zio-backup/passwd diff --git a/usr/local/sbin/zio-backup b/usr/local/sbin/zio-backup index bf5b79e..f146972 100755 --- a/usr/local/sbin/zio-backup +++ b/usr/local/sbin/zio-backup @@ -30,11 +30,11 @@ function backup() { --iexclude "tmp" \ --exclude-if-present ".nobackup" \ --hostname "$host" \ + --password-file "$passwd_file" \ --repo "$repo" \ --tag "$tag" \ --verbose \ `[[ -s $args ]] && echo "$args"` "$path" \ - --dry-run fi } @@ -75,6 +75,7 @@ function test_path() { host="de01" repo="b2:zio-euc-servers" +passwd_file="" pre_script="" post_script="" services=() @@ -89,6 +90,12 @@ else [[ ! -z $(get_prop "$env_dir/$host.var" SERVICES) ]] && \ IFS=';' read -ra services <<< "$(get_prop "$env_dir/$host.var" SERVICES)" fi + + if [[ -f "$env_dir/passwd" ]]; then + passwd_file="$env_dir/passwd" + else + say_warn "Password file ($passwd_file) not found." + fi fi if [[ ! -z $pre_script ]]; then diff --git a/var/zio-backup/passwd b/var/zio-backup/passwd new file mode 100644 index 0000000..b1381c0 --- /dev/null +++ b/var/zio-backup/passwd @@ -0,0 +1 @@ +9%62hqWZwgLWEJ4@k7gG3*o4Zt#%dBiA